diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index 7874e0918..4064c71cb 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -38,6 +38,7 @@ LOCAL_SRC_FILES := \
 	core/bootstages.cpp \
 	core/socket.cpp \
 	core/db.cpp \
+	core/scripting.cpp \
 	magiskhide/magiskhide.cpp \
 	magiskhide/proc_monitor.cpp \
 	magiskhide/hide_utils.cpp \
diff --git a/native/jni/core/bootstages.cpp b/native/jni/core/bootstages.cpp
index 7c75a8a2b..41299e2dc 100644
--- a/native/jni/core/bootstages.cpp
+++ b/native/jni/core/bootstages.cpp
@@ -79,6 +79,9 @@ private:
 	int get_path(char *path);
 };
 
+//char node_entry::buf[] = {};
+//char node_entry::buf2[] = {};
+
 node_entry::node_entry(const char *name, uint8_t status, uint8_t type)
 		: name(name), type(type), status(status), parent(nullptr) {}
 
@@ -289,72 +292,6 @@ node_entry *node_entry::extract(const char *name) {
 	return node;
 }
 
-/***********
- * setenvs *
- ***********/
-
-static void set_path() {
-	sprintf(buf, BBPATH ":%s", getenv("PATH"));
-	setenv("PATH", buf, 1);
-}
-
-static void set_mirror_path() {
-	setenv("PATH", BBPATH ":/sbin:" MIRRDIR "/system/bin:"
-				   MIRRDIR "/system/xbin:" MIRRDIR "/vendor/bin", 1);
-}
-
-/***********
- * Scripts *
- ***********/
-
-static void exec_common_script(const char* stage) {
-	DIR *dir;
-	struct dirent *entry;
-	sprintf(buf2, SECURE_DIR "/%s.d", stage);
-	if (!(dir = xopendir(buf2)))
-		return;
-	chdir(buf2);
-
-	bool pfs = strcmp(stage, "post-fs-data") == 0;
-	while ((entry = xreaddir(dir))) {
-		if (entry->d_type == DT_REG) {
-			if (access(entry->d_name, X_OK) == -1)
-				continue;
-			LOGI("%s.d: exec [%s]\n", stage, entry->d_name);
-			exec_t exec {
-				.pre_exec = pfs ? set_mirror_path : set_path,
-				.fork = pfs ? xfork : fork_dont_care
-			};
-			if (pfs)
-				exec_command_sync(exec, MIRRDIR "/system/bin/sh", entry->d_name);
-			else
-				exec_command(exec, MIRRDIR "/system/bin/sh", entry->d_name);
-		}
-	}
-
-	closedir(dir);
-	chdir("/");
-}
-
-static void exec_module_script(const char* stage) {
-	bool pfs = strcmp(stage, "post-fs-data") == 0;
-	for (auto &m : module_list) {
-		const char* module = m.c_str();
-		sprintf(buf2, MODULEROOT "/%s/%s.sh", module, stage);
-		if (access(buf2, F_OK) == -1)
-			continue;
-		LOGI("%s: exec [%s.sh]\n", module, stage);
-		exec_t exec {
-			.pre_exec = pfs ? set_mirror_path : set_path,
-			.fork = pfs ? xfork : fork_dont_care
-		};
-		if (pfs)
-			exec_command_sync(exec, MIRRDIR "/system/bin/sh", buf2);
-		else
-			exec_command(exec, MIRRDIR "/system/bin/sh", buf2);
-	}
-}
-
 /****************
  * Simple Mount *
  ****************/
@@ -492,34 +429,11 @@ static bool magisk_env() {
 	return true;
 }
 
-/* Too lazy to do it natively, let's write some scripts */
-static const char migrate_cmd[] =
-"IMG=%s;"
-"MNT=/dev/img_mnt;"
-"e2fsck -yf $IMG;"
-"mkdir -p $MNT;"
-"for num in 0 1 2 3 4 5 6 7; do"
-"  losetup /dev/block/loop${num} $IMG || continue;"
-"  mount -t ext4 /dev/block/loop${num} $MNT;"
-"  rm -rf $MNT/lost+found $MNT/.core;"
-"  magisk --clone $MNT " MODULEROOT ";"
-"  umount $MNT;"
-"  rm -rf $MNT;"
-"  losetup -d /dev/block/loop${num};"
-"  break;"
-"done;"
-"rm -rf $IMG";
-
 static void upgrade_modules() {
 	const char *legacy_imgs[] = {SECURE_DIR "/magisk.img", SECURE_DIR "/magisk_merge.img"};
 	for (auto img : legacy_imgs) {
-		if (access(img, F_OK) == 0) {
-			LOGI("* Migrating %s\n", img);
-			exec_t exec { .pre_exec = set_path };
-			char cmds[sizeof(migrate_cmd) + 32];
-			sprintf(cmds, migrate_cmd, img);
-			exec_command_sync(exec, "/system/bin/sh", "-c", cmds);
-		}
+		if (access(img, F_OK) == 0)
+			migrate_img(img);
 	}
 	DIR *dir;
 	struct dirent *entry;
@@ -575,31 +489,6 @@ static void collect_modules() {
 	chdir("/");
 }
 
-static void install_apk(const char *apk) {
-	setfilecon(apk, "u:object_r:" SEPOL_FILE_DOMAIN ":s0");
-	while (true) {
-		sleep(5);
-		LOGD("apk_install: attempting to install APK\n");
-		exec_t exec { .err = true, .fd = -1 };
-		int pid = exec_command(exec, "/system/bin/pm", "install", "-r", apk);
-		if (pid != -1) {
-			FILE *res = fdopen(exec.fd, "r");
-			bool err = false;
-			while (fgets(buf, PATH_MAX, res)) {
-				LOGD("apk_install: %s", buf);
-				err |= strstr(buf, "Error:") != nullptr;
-			}
-			waitpid(pid, nullptr, 0);
-			fclose(res);
-			// Keep trying until pm is started
-			if (err)
-				continue;
-			break;
-		}
-	}
-	unlink(apk);
-}
-
 static bool check_data() {
 	bool mnt = false;
 	bool data = false;
@@ -756,7 +645,7 @@ void post_fs_data(int client) {
 
 	// Execute module scripts
 	LOGI("* Running module post-fs-data scripts\n");
-	exec_module_script("post-fs-data");
+	exec_module_script("post-fs-data", module_list);
 
 	// Recollect modules
 	module_list.clear();
@@ -843,7 +732,7 @@ void late_start(int client) {
 		goto core_only;
 
 	LOGI("* Running module service scripts\n");
-	exec_module_script("service");
+	exec_module_script("service", module_list);
 
 core_only:
 	if (access(MANAGERAPK, F_OK) == 0) {
diff --git a/native/jni/core/scripting.cpp b/native/jni/core/scripting.cpp
new file mode 100644
index 000000000..fe7b8872d
--- /dev/null
+++ b/native/jni/core/scripting.cpp
@@ -0,0 +1,117 @@
+#include <unistd.h>
+#include <cstdio>
+#include <cstdlib>
+#include <string>
+#include <vector>
+
+#include <magisk.h>
+#include <utils.h>
+#include <selinux.h>
+
+using namespace std;
+
+static void set_path() {
+	char buf[4096];
+	sprintf(buf, BBPATH ":%s", getenv("PATH"));
+	setenv("PATH", buf, 1);
+}
+
+static void set_mirror_path() {
+	setenv("PATH", BBPATH ":/sbin:" MIRRDIR "/system/bin:"
+	MIRRDIR "/system/xbin:" MIRRDIR "/vendor/bin", 1);
+}
+
+void exec_common_script(const char *stage) {
+	char path[4096];
+	DIR *dir;
+	struct dirent *entry;
+	sprintf(path, SECURE_DIR "/%s.d", stage);
+	if (!(dir = xopendir(path)))
+		return;
+	chdir(path);
+
+	bool pfs = strcmp(stage, "post-fs-data") == 0;
+	while ((entry = xreaddir(dir))) {
+		if (entry->d_type == DT_REG) {
+			if (access(entry->d_name, X_OK) == -1)
+				continue;
+			LOGI("%s.d: exec [%s]\n", stage, entry->d_name);
+			exec_t exec {
+				.pre_exec = pfs ? set_mirror_path : set_path,
+				.fork = pfs ? xfork : fork_dont_care
+			};
+			if (pfs)
+				exec_command_sync(exec, MIRRDIR "/system/bin/sh", entry->d_name);
+			else
+				exec_command(exec, MIRRDIR "/system/bin/sh", entry->d_name);
+		}
+	}
+
+	closedir(dir);
+	chdir("/");
+}
+
+void exec_module_script(const char *stage, const vector<string> &module_list) {
+	char path[4096];
+	bool pfs = strcmp(stage, "post-fs-data") == 0;
+	for (auto &m : module_list) {
+		const char* module = m.c_str();
+		sprintf(path, MODULEROOT "/%s/%s.sh", module, stage);
+		if (access(path, F_OK) == -1)
+			continue;
+		LOGI("%s: exec [%s.sh]\n", module, stage);
+		exec_t exec {
+			.pre_exec = pfs ? set_mirror_path : set_path,
+			.fork = pfs ? xfork : fork_dont_care
+		};
+		if (pfs)
+			exec_command_sync(exec, MIRRDIR "/system/bin/sh", path);
+		else
+			exec_command(exec, MIRRDIR "/system/bin/sh", path);
+	}
+}
+
+static const char migrate_script[] =
+"IMG=%s;"
+"MNT=/dev/img_mnt;"
+"e2fsck -yf $IMG;"
+"mkdir -p $MNT;"
+"for num in 0 1 2 3 4 5 6 7; do"
+"  losetup /dev/block/loop${num} $IMG || continue;"
+"  mount -t ext4 /dev/block/loop${num} $MNT;"
+"  rm -rf $MNT/lost+found $MNT/.core;"
+"  magisk --clone $MNT " MODULEROOT ";"
+"  umount $MNT;"
+"  rm -rf $MNT;"
+"  losetup -d /dev/block/loop${num};"
+"  break;"
+"done;"
+"rm -rf $IMG";
+
+void migrate_img(const char *img) {
+	LOGI("* Migrating %s\n", img);
+	exec_t exec { .pre_exec = set_path };
+	char cmds[sizeof(migrate_script) + 32];
+	sprintf(cmds, migrate_script, img);
+	exec_command_sync(exec, "/system/bin/sh", "-c", cmds);
+}
+
+static const char install_script[] =
+"while true; do"
+"  OUT=`pm install -r $APK`;"
+"  log -t Magisk \"apk_install: $OUT\";"
+"  if echo \"$OUT\" | grep -q 'Error:'; then"
+"    sleep 5;"
+"    continue;"
+"  fi;"
+"  break;"
+"done";
+
+void install_apk(const char *apk) {
+	setfilecon(apk, "u:object_r:" SEPOL_FILE_DOMAIN ":s0");
+	LOGI("apk_install: %s\n", apk);
+	exec_t exec { .pre_exec = set_mirror_path };
+	char cmds[sizeof(install_script) + 4096];
+	sprintf(cmds, "APK=%s;%s;rm -f $APK", apk, install_script);
+	exec_command_sync(exec, "/system/bin/sh", "-c", cmds);
+}
diff --git a/native/jni/core/socket.cpp b/native/jni/core/socket.cpp
index a875b551b..eb0293e83 100644
--- a/native/jni/core/socket.cpp
+++ b/native/jni/core/socket.cpp
@@ -7,7 +7,6 @@
 #include <endian.h>
 
 #include <daemon.h>
-#include <logging.h>
 #include <utils.h>
 #include <magisk.h>
 
diff --git a/native/jni/include/daemon.h b/native/jni/include/daemon.h
index b8595fc90..85df78c9b 100644
--- a/native/jni/include/daemon.h
+++ b/native/jni/include/daemon.h
@@ -7,6 +7,8 @@
 #include <pthread.h>
 #include <sys/un.h>
 #include <sys/socket.h>
+#include <string>
+#include <vector>
 
 // Commands require connecting to daemon
 enum {
@@ -62,6 +64,15 @@ void post_fs_data(int client);
 void late_start(int client);
 void boot_complete(int client);
 
+/*************
+ * Scripting *
+ *************/
+
+void exec_common_script(const char *stage);
+void exec_module_script(const char *stage, const std::vector<std::string> &module_list);
+void migrate_img(const char *img);
+void install_apk(const char *apk);
+
 /**************
  * MagiskHide *
  **************/
diff --git a/native/jni/include/magisk.h b/native/jni/include/magisk.h
index ec31181ab..b7c8c7c02 100644
--- a/native/jni/include/magisk.h
+++ b/native/jni/include/magisk.h
@@ -4,7 +4,7 @@
 #ifndef _MAGISK_H_
 #define _MAGISK_H_
 
-#include "logging.h"
+#include <logging.h>
 
 #define MAIN_SOCKET  "d30138f2310a9fb9c54a3e0c21f58591"
 #define LOG_SOCKET   "5864cd77f2f8c59b3882e2d35dbf51e4"
diff --git a/native/jni/resetprop/_resetprop.h b/native/jni/resetprop/_resetprop.h
index 591ed576e..300d25ef7 100644
--- a/native/jni/resetprop/_resetprop.h
+++ b/native/jni/resetprop/_resetprop.h
@@ -6,8 +6,9 @@
 #define MAGISK_PROPS_H
 
 #include <string>
-#include "resetprop/private/system_properties.h"
-#include "logging.h"
+#include <logging.h>
+
+#include "private/system_properties.h"
 
 struct prop_t {
 	char *name;