diff --git a/Android.mk b/Android.mk
index d5693d6..9978497 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,8 +2,8 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := magisk.apk
-LOCAL_SRC_FILES := magisk/system/etc/init/magisk/magisk.apk
+LOCAL_MODULE := magisk
+LOCAL_SRC_FILES := magisk.apk 
 LOCAL_MODULE_CLASS := APPS
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
diff --git a/device.mk b/device.mk
index 2ff3d23..0eb36bc 100644
--- a/device.mk
+++ b/device.mk
@@ -1,10 +1,6 @@
-
 PRODUCT_PACKAGES += \
-    magisk.apk
+    magisk
 
 PRODUCT_COPY_FILES += \
-    vendor/magisk/magisk/system/etc/init/magisk/busybox:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/busybox:0755 \
-    vendor/magisk/magisk/system/etc/init/magisk/magisk:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/magisk:0755 \
-    vendor/magisk/magisk/system/etc/init/magisk/magiskboot:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/magiskboot:0755 \
-    vendor/magisk/magisk/system/etc/init/magisk/magiskinit:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/magiskinit:0755 \
-    vendor/magisk/magisk/system/etc/init/magisk/magiskpolicy:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk/magiskpolicy:0755
+    vendor/magisk/magisk.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk.rc
+    $(call find-copy-subdir-files,*,vendor/magisk/magisk,$(TARGET_COPY_OUT_SYSTEM)/etc/init/magisk)
\ No newline at end of file