diff --git a/config/common.mk b/config/common.mk
index ae7d5fc..e365502 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -42,7 +42,7 @@
     ro.control_privapp_permissions=enforce
 
 PRODUCT_COPY_FILES += \
-    vendor/omni/prebuilt/bin/clean_cache.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/clean_cache.sh
+    vendor/omni/prebuilt/common/bin/clean_cache.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/clean_cache.sh
 
 # Backup Tool
 ifeq ($(AB_OTA_UPDATER),true)
@@ -56,9 +56,10 @@
 endif
 else
 PRODUCT_COPY_FILES += \
-    vendor/omni/prebuilt/bin/backuptool.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool.sh \
-    vendor/omni/prebuilt/bin/backuptool.functions:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool.functions \
-    vendor/omni/prebuilt/bin/blacklist:$(TARGET_COPY_OUT_SYSTEM)/addon.d/blacklist
+    vendor/omni/prebuilt/common/bin/50-hosts.sh:system/addon.d/50-hosts.sh \
+    vendor/omni/prebuilt/common/bin/backuptool.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool.sh \
+    vendor/omni/prebuilt/common/bin/backuptool.functions:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool.functions \
+    vendor/omni/prebuilt/common/bin/blacklist:$(TARGET_COPY_OUT_SYSTEM)/addon.d/blacklist
 endif
 
 # Backup Services whitelist
diff --git a/prebuilt/bin/50-hosts.sh b/prebuilt/common/bin/50-hosts.sh
similarity index 100%
rename from prebuilt/bin/50-hosts.sh
rename to prebuilt/common/bin/50-hosts.sh
diff --git a/prebuilt/bin/backuptool.functions b/prebuilt/common/bin/backuptool.functions
similarity index 100%
rename from prebuilt/bin/backuptool.functions
rename to prebuilt/common/bin/backuptool.functions
diff --git a/prebuilt/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
similarity index 100%
rename from prebuilt/bin/backuptool.sh
rename to prebuilt/common/bin/backuptool.sh
diff --git a/prebuilt/bin/blacklist b/prebuilt/common/bin/blacklist
similarity index 100%
rename from prebuilt/bin/blacklist
rename to prebuilt/common/bin/blacklist
diff --git a/prebuilt/bin/clean_cache.sh b/prebuilt/common/bin/clean_cache.sh
similarity index 100%
rename from prebuilt/bin/clean_cache.sh
rename to prebuilt/common/bin/clean_cache.sh