diff --git a/overlays/FrameworkResOverlay/Android.bp b/Android.bp
similarity index 100%
rename from overlays/FrameworkResOverlay/Android.bp
rename to Android.bp
diff --git a/overlays/FrameworkResOverlay/AndroidManifest.xml b/AndroidManifest.xml
similarity index 79%
rename from overlays/FrameworkResOverlay/AndroidManifest.xml
rename to AndroidManifest.xml
index f9a4774..c5ac10a 100644
--- a/overlays/FrameworkResOverlay/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="android.overlay.frameworkres.oxmc">
 
-    <!-- Overlay targets the system framework resources -->
     <overlay
         android:targetPackage="android"
         android:isStatic="true"
diff --git a/device.mk b/device.mk
index 1e16181..b67f39c 100644
--- a/device.mk
+++ b/device.mk
@@ -1,11 +1,3 @@
-# Include overlay package
+# Overlay packages
 PRODUCT_PACKAGES += \
-    FrameworkResDevOxmcOverlay
-
-# Copy system-wide font
-PRODUCT_COPY_FILES += \
-    vendor/dev.oxmc/fonts/ArcticonsSans-Regular.otf:system/fonts/ArcticonsSans-Regular.otf
-
-# Copy system-wide icon (commented out until needed)
-# PRODUCT_COPY_FILES += \
-#     vendor/dev.oxmc/icons/ic_settings_oxmc.xml:system/etc/permissions/ic_settings_oxmc.xml
\ No newline at end of file
+    FrameworkResDevOxmcOverlay
\ No newline at end of file
diff --git a/font/ArcticonsSans-Regular.otf b/font/ArcticonsSans-Regular.otf
deleted file mode 100644
index cd83624..0000000
Binary files a/font/ArcticonsSans-Regular.otf and /dev/null differ
diff --git a/overlays/FrameworkResOverlay/res/drawable-nodpi/pink_protogen.png b/res/drawable-nodpi/pink_protogen.png
similarity index 100%
rename from overlays/FrameworkResOverlay/res/drawable-nodpi/pink_protogen.png
rename to res/drawable-nodpi/pink_protogen.png
diff --git a/overlays/FrameworkResOverlay/res/fallback_fonts.xml b/res/fallback_fonts.xml
similarity index 100%
rename from overlays/FrameworkResOverlay/res/fallback_fonts.xml
rename to res/fallback_fonts.xml
diff --git a/overlays/FrameworkResOverlay/res/values/config.xml b/res/values/config.xml
similarity index 100%
rename from overlays/FrameworkResOverlay/res/values/config.xml
rename to res/values/config.xml