diff --git a/.gitmodules b/.gitmodules
index cdc9d7a6e..f83db1bb1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,27 +1,27 @@
-[submodule "jni/selinux"]
-	path = core/jni/external/selinux
+[submodule "selinux"]
+	path = native/jni/external/selinux
 	url = https://github.com/topjohnwu/selinux.git
-[submodule "jni/su"]
-	path = core/jni/su
+[submodule "su"]
+	path = native/jni/su
 	url = https://github.com/topjohnwu/MagiskSU.git
-[submodule "jni/magiskpolicy"]
-	path = core/jni/magiskpolicy
+[submodule "magiskpolicy"]
+	path = native/jni/magiskpolicy
 	url = https://github.com/topjohnwu/magiskpolicy.git
 [submodule "MagiskManager"]
 	path = app
 	url = https://github.com/topjohnwu/MagiskManager.git
-[submodule "jni/busybox"]
-	path = core/jni/external/busybox
+[submodule "busybox"]
+	path = native/jni/external/busybox
 	url = https://github.com/topjohnwu/ndk-busybox.git
-[submodule "jni/external/dtc"]
-	path = core/jni/external/dtc
+[submodule "dtc"]
+	path = native/jni/external/dtc
 	url = https://github.com/dgibson/dtc
-[submodule "jni/external/lz4"]
-	path = core/jni/external/lz4
+[submodule "lz4"]
+	path = native/jni/external/lz4
 	url = https://github.com/lz4/lz4.git
-[submodule "jni/external/bzip2"]
-	path = core/jni/external/bzip2
+[submodule "bzip2"]
+	path = native/jni/external/bzip2
 	url = https://github.com/nemequ/bzip2.git
-[submodule "jni/external/xz"]
-	path = core/jni/external/xz
+[submodule "xz"]
+	path = native/jni/external/xz
 	url = https://github.com/xz-mirror/xz.git
diff --git a/build.py b/build.py
index 845b5ac02..63f49a188 100755
--- a/build.py
+++ b/build.py
@@ -82,13 +82,13 @@ def build_binary(args):
 	header('* Building Magisk binaries')
 
 	# Force update logging.h timestamp to trigger recompilation
-	os.utime(os.path.join('core', 'jni', 'include', 'logging.h'))
+	os.utime(os.path.join('native', 'jni', 'include', 'logging.h'))
 
 	debug_flag = '' if args.release else '-DMAGISK_DEBUG'
 	cflag = 'MAGISK_FLAGS=\"-DMAGISK_VERSION=\\\"{}\\\" -DMAGISK_VER_CODE={} {}\"'.format(args.versionString, args.versionCode, debug_flag)
 
 	# Prebuild
-	proc = subprocess.run('{} -C core PRECOMPILE=true {} -j{}'.format(ndk_build, cflag, multiprocessing.cpu_count()), shell=True)
+	proc = subprocess.run('{} -C native PRECOMPILE=true {} -j{}'.format(ndk_build, cflag, multiprocessing.cpu_count()), shell=True)
 	if proc.returncode != 0:
 		error('Build Magisk binary failed!')
 
@@ -97,7 +97,7 @@ def build_binary(args):
 		mkdir_p(os.path.join('out', arch))
 		with open(os.path.join('out', arch, 'dump.h'), 'w') as dump:
 			dump.write('#include "stdlib.h"\n')
-			mv(os.path.join('core', 'libs', arch, 'magisk'), os.path.join('out', arch, 'magisk'))
+			mv(os.path.join('native', 'libs', arch, 'magisk'), os.path.join('out', arch, 'magisk'))
 			with open(os.path.join('out', arch, 'magisk'), 'rb') as bin:
 				dump.write('const uint8_t magisk_dump[] = "')
 				dump.write(''.join("\\x{:02X}".format(c) for c in lzma.compress(bin.read(), preset=9)))
@@ -105,7 +105,7 @@ def build_binary(args):
 
 	print('')
 
-	proc = subprocess.run('{} -C core {} -j{}'.format(ndk_build, cflag, multiprocessing.cpu_count()), shell=True)
+	proc = subprocess.run('{} -C native {} -j{}'.format(ndk_build, cflag, multiprocessing.cpu_count()), shell=True)
 	if proc.returncode != 0:
 		error('Build Magisk binary failed!')
 
@@ -113,7 +113,7 @@ def build_binary(args):
 	for arch in ['arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64']:
 		for binary in ['magiskinit', 'magiskboot', 'b64xz', 'busybox']:
 			try:
-				mv(os.path.join('core', 'libs', arch, binary), os.path.join('out', arch, binary))
+				mv(os.path.join('native', 'libs', arch, binary), os.path.join('out', arch, binary))
 			except:
 				pass
 
@@ -342,8 +342,8 @@ def cleanup(args):
 
 	if 'binary' in args.target:
 		header('* Cleaning binaries')
-		subprocess.run(ndk_build + ' -C core PRECOMPILE=true clean', shell=True)
-		subprocess.run(ndk_build + ' -C core clean', shell=True)
+		subprocess.run(ndk_build + ' -C native PRECOMPILE=true clean', shell=True)
+		subprocess.run(ndk_build + ' -C native clean', shell=True)
 		for arch in ['arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64']:
 			shutil.rmtree(os.path.join('out', arch), ignore_errors=True)
 
diff --git a/core/.gitignore b/native/.gitignore
similarity index 100%
rename from core/.gitignore
rename to native/.gitignore
diff --git a/core/build.gradle b/native/build.gradle
similarity index 100%
rename from core/build.gradle
rename to native/build.gradle
diff --git a/core/jni/Android.mk b/native/jni/Android.mk
similarity index 100%
rename from core/jni/Android.mk
rename to native/jni/Android.mk
diff --git a/core/jni/Application.mk b/native/jni/Application.mk
similarity index 100%
rename from core/jni/Application.mk
rename to native/jni/Application.mk
diff --git a/core/jni/b64xz.c b/native/jni/b64xz.c
similarity index 100%
rename from core/jni/b64xz.c
rename to native/jni/b64xz.c
diff --git a/core/jni/core/bootstages.c b/native/jni/core/bootstages.c
similarity index 100%
rename from core/jni/core/bootstages.c
rename to native/jni/core/bootstages.c
diff --git a/core/jni/core/daemon.c b/native/jni/core/daemon.c
similarity index 100%
rename from core/jni/core/daemon.c
rename to native/jni/core/daemon.c
diff --git a/core/jni/core/log_monitor.c b/native/jni/core/log_monitor.c
similarity index 100%
rename from core/jni/core/log_monitor.c
rename to native/jni/core/log_monitor.c
diff --git a/core/jni/core/magisk.c b/native/jni/core/magisk.c
similarity index 100%
rename from core/jni/core/magisk.c
rename to native/jni/core/magisk.c
diff --git a/core/jni/core/magiskinit.c b/native/jni/core/magiskinit.c
similarity index 100%
rename from core/jni/core/magiskinit.c
rename to native/jni/core/magiskinit.c
diff --git a/core/jni/core/socket.c b/native/jni/core/socket.c
similarity index 100%
rename from core/jni/core/socket.c
rename to native/jni/core/socket.c
diff --git a/core/jni/external/Android.mk b/native/jni/external/Android.mk
similarity index 100%
rename from core/jni/external/Android.mk
rename to native/jni/external/Android.mk
diff --git a/core/jni/external/busybox b/native/jni/external/busybox
similarity index 100%
rename from core/jni/external/busybox
rename to native/jni/external/busybox
diff --git a/core/jni/external/bzip2 b/native/jni/external/bzip2
similarity index 100%
rename from core/jni/external/bzip2
rename to native/jni/external/bzip2
diff --git a/core/jni/external/dtc b/native/jni/external/dtc
similarity index 100%
rename from core/jni/external/dtc
rename to native/jni/external/dtc
diff --git a/core/jni/external/include/sha1.h b/native/jni/external/include/sha1.h
similarity index 100%
rename from core/jni/external/include/sha1.h
rename to native/jni/external/include/sha1.h
diff --git a/core/jni/external/include/sqlite3.h b/native/jni/external/include/sqlite3.h
similarity index 100%
rename from core/jni/external/include/sqlite3.h
rename to native/jni/external/include/sqlite3.h
diff --git a/core/jni/external/include/xz_config/config.h b/native/jni/external/include/xz_config/config.h
similarity index 100%
rename from core/jni/external/include/xz_config/config.h
rename to native/jni/external/include/xz_config/config.h
diff --git a/core/jni/external/lz4 b/native/jni/external/lz4
similarity index 100%
rename from core/jni/external/lz4
rename to native/jni/external/lz4
diff --git a/core/jni/external/selinux b/native/jni/external/selinux
similarity index 100%
rename from core/jni/external/selinux
rename to native/jni/external/selinux
diff --git a/core/jni/external/sha1/sha1.c b/native/jni/external/sha1/sha1.c
similarity index 100%
rename from core/jni/external/sha1/sha1.c
rename to native/jni/external/sha1/sha1.c
diff --git a/core/jni/external/stubs/selinux_stub.c b/native/jni/external/stubs/selinux_stub.c
similarity index 100%
rename from core/jni/external/stubs/selinux_stub.c
rename to native/jni/external/stubs/selinux_stub.c
diff --git a/core/jni/external/stubs/sqlite3_stub.c b/native/jni/external/stubs/sqlite3_stub.c
similarity index 100%
rename from core/jni/external/stubs/sqlite3_stub.c
rename to native/jni/external/stubs/sqlite3_stub.c
diff --git a/core/jni/external/xz b/native/jni/external/xz
similarity index 100%
rename from core/jni/external/xz
rename to native/jni/external/xz
diff --git a/core/jni/include/cpio.h b/native/jni/include/cpio.h
similarity index 100%
rename from core/jni/include/cpio.h
rename to native/jni/include/cpio.h
diff --git a/core/jni/include/daemon.h b/native/jni/include/daemon.h
similarity index 100%
rename from core/jni/include/daemon.h
rename to native/jni/include/daemon.h
diff --git a/core/jni/include/list.h b/native/jni/include/list.h
similarity index 100%
rename from core/jni/include/list.h
rename to native/jni/include/list.h
diff --git a/core/jni/include/logging.h b/native/jni/include/logging.h
similarity index 100%
rename from core/jni/include/logging.h
rename to native/jni/include/logging.h
diff --git a/core/jni/include/magisk.h b/native/jni/include/magisk.h
similarity index 100%
rename from core/jni/include/magisk.h
rename to native/jni/include/magisk.h
diff --git a/core/jni/include/magiskrc.h b/native/jni/include/magiskrc.h
similarity index 100%
rename from core/jni/include/magiskrc.h
rename to native/jni/include/magiskrc.h
diff --git a/core/jni/include/resetprop.h b/native/jni/include/resetprop.h
similarity index 100%
rename from core/jni/include/resetprop.h
rename to native/jni/include/resetprop.h
diff --git a/core/jni/include/utils.h b/native/jni/include/utils.h
similarity index 100%
rename from core/jni/include/utils.h
rename to native/jni/include/utils.h
diff --git a/core/jni/include/vector.h b/native/jni/include/vector.h
similarity index 100%
rename from core/jni/include/vector.h
rename to native/jni/include/vector.h
diff --git a/core/jni/magiskboot/bootimg.c b/native/jni/magiskboot/bootimg.c
similarity index 100%
rename from core/jni/magiskboot/bootimg.c
rename to native/jni/magiskboot/bootimg.c
diff --git a/core/jni/magiskboot/bootimg.h b/native/jni/magiskboot/bootimg.h
similarity index 100%
rename from core/jni/magiskboot/bootimg.h
rename to native/jni/magiskboot/bootimg.h
diff --git a/core/jni/magiskboot/compress.c b/native/jni/magiskboot/compress.c
similarity index 100%
rename from core/jni/magiskboot/compress.c
rename to native/jni/magiskboot/compress.c
diff --git a/core/jni/magiskboot/dtb.c b/native/jni/magiskboot/dtb.c
similarity index 100%
rename from core/jni/magiskboot/dtb.c
rename to native/jni/magiskboot/dtb.c
diff --git a/core/jni/magiskboot/hexpatch.c b/native/jni/magiskboot/hexpatch.c
similarity index 100%
rename from core/jni/magiskboot/hexpatch.c
rename to native/jni/magiskboot/hexpatch.c
diff --git a/core/jni/magiskboot/magiskboot.h b/native/jni/magiskboot/magiskboot.h
similarity index 100%
rename from core/jni/magiskboot/magiskboot.h
rename to native/jni/magiskboot/magiskboot.h
diff --git a/core/jni/magiskboot/main.c b/native/jni/magiskboot/main.c
similarity index 100%
rename from core/jni/magiskboot/main.c
rename to native/jni/magiskboot/main.c
diff --git a/core/jni/magiskboot/ramdisk.c b/native/jni/magiskboot/ramdisk.c
similarity index 100%
rename from core/jni/magiskboot/ramdisk.c
rename to native/jni/magiskboot/ramdisk.c
diff --git a/core/jni/magiskboot/types.c b/native/jni/magiskboot/types.c
similarity index 100%
rename from core/jni/magiskboot/types.c
rename to native/jni/magiskboot/types.c
diff --git a/core/jni/magiskboot/types.h b/native/jni/magiskboot/types.h
similarity index 100%
rename from core/jni/magiskboot/types.h
rename to native/jni/magiskboot/types.h
diff --git a/core/jni/magiskhide/hide_utils.c b/native/jni/magiskhide/hide_utils.c
similarity index 100%
rename from core/jni/magiskhide/hide_utils.c
rename to native/jni/magiskhide/hide_utils.c
diff --git a/core/jni/magiskhide/magiskhide.c b/native/jni/magiskhide/magiskhide.c
similarity index 100%
rename from core/jni/magiskhide/magiskhide.c
rename to native/jni/magiskhide/magiskhide.c
diff --git a/core/jni/magiskhide/magiskhide.h b/native/jni/magiskhide/magiskhide.h
similarity index 100%
rename from core/jni/magiskhide/magiskhide.h
rename to native/jni/magiskhide/magiskhide.h
diff --git a/core/jni/magiskhide/proc_monitor.c b/native/jni/magiskhide/proc_monitor.c
similarity index 100%
rename from core/jni/magiskhide/proc_monitor.c
rename to native/jni/magiskhide/proc_monitor.c
diff --git a/core/jni/magiskpolicy b/native/jni/magiskpolicy
similarity index 100%
rename from core/jni/magiskpolicy
rename to native/jni/magiskpolicy
diff --git a/core/jni/resetprop/ErrnoRestorer.h b/native/jni/resetprop/ErrnoRestorer.h
similarity index 100%
rename from core/jni/resetprop/ErrnoRestorer.h
rename to native/jni/resetprop/ErrnoRestorer.h
diff --git a/core/jni/resetprop/_system_properties.h b/native/jni/resetprop/_system_properties.h
similarity index 100%
rename from core/jni/resetprop/_system_properties.h
rename to native/jni/resetprop/_system_properties.h
diff --git a/core/jni/resetprop/bionic_futex.h b/native/jni/resetprop/bionic_futex.h
similarity index 100%
rename from core/jni/resetprop/bionic_futex.h
rename to native/jni/resetprop/bionic_futex.h
diff --git a/core/jni/resetprop/bionic_lock.h b/native/jni/resetprop/bionic_lock.h
similarity index 100%
rename from core/jni/resetprop/bionic_lock.h
rename to native/jni/resetprop/bionic_lock.h
diff --git a/core/jni/resetprop/bionic_macros.h b/native/jni/resetprop/bionic_macros.h
similarity index 100%
rename from core/jni/resetprop/bionic_macros.h
rename to native/jni/resetprop/bionic_macros.h
diff --git a/core/jni/resetprop/resetprop.cpp b/native/jni/resetprop/resetprop.cpp
similarity index 100%
rename from core/jni/resetprop/resetprop.cpp
rename to native/jni/resetprop/resetprop.cpp
diff --git a/core/jni/resetprop/system_properties.cpp b/native/jni/resetprop/system_properties.cpp
similarity index 100%
rename from core/jni/resetprop/system_properties.cpp
rename to native/jni/resetprop/system_properties.cpp
diff --git a/core/jni/resetprop/system_properties.h b/native/jni/resetprop/system_properties.h
similarity index 100%
rename from core/jni/resetprop/system_properties.h
rename to native/jni/resetprop/system_properties.h
diff --git a/core/jni/su b/native/jni/su
similarity index 100%
rename from core/jni/su
rename to native/jni/su
diff --git a/core/jni/utils/cpio.c b/native/jni/utils/cpio.c
similarity index 100%
rename from core/jni/utils/cpio.c
rename to native/jni/utils/cpio.c
diff --git a/core/jni/utils/file.c b/native/jni/utils/file.c
similarity index 100%
rename from core/jni/utils/file.c
rename to native/jni/utils/file.c
diff --git a/core/jni/utils/img.c b/native/jni/utils/img.c
similarity index 100%
rename from core/jni/utils/img.c
rename to native/jni/utils/img.c
diff --git a/core/jni/utils/list.c b/native/jni/utils/list.c
similarity index 100%
rename from core/jni/utils/list.c
rename to native/jni/utils/list.c
diff --git a/core/jni/utils/misc.c b/native/jni/utils/misc.c
similarity index 100%
rename from core/jni/utils/misc.c
rename to native/jni/utils/misc.c
diff --git a/core/jni/utils/pattern.c b/native/jni/utils/pattern.c
similarity index 100%
rename from core/jni/utils/pattern.c
rename to native/jni/utils/pattern.c
diff --git a/core/jni/utils/vector.c b/native/jni/utils/vector.c
similarity index 100%
rename from core/jni/utils/vector.c
rename to native/jni/utils/vector.c
diff --git a/core/jni/utils/xwrap.c b/native/jni/utils/xwrap.c
similarity index 100%
rename from core/jni/utils/xwrap.c
rename to native/jni/utils/xwrap.c
diff --git a/core/src/main/AndroidManifest.xml b/native/src/main/AndroidManifest.xml
similarity index 100%
rename from core/src/main/AndroidManifest.xml
rename to native/src/main/AndroidManifest.xml
diff --git a/settings.gradle b/settings.gradle
index 48e588e59..115c565b8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':core', ':utils', ':snet'
+include ':app', ':native', ':utils', ':snet'