diff --git a/core b/core
index 34f1224..e99813b 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 34f12244c931941420d011fbffb1858c8c045c1f
+Subproject commit e99813b54035ad7e8e1792c808e7ee42c3fb19f0
diff --git a/gradle/lspatch.versions.toml b/gradle/lspatch.versions.toml
index d1e0a96..7ecb2dc 100644
--- a/gradle/lspatch.versions.toml
+++ b/gradle/lspatch.versions.toml
@@ -4,7 +4,7 @@ accompanist = "0.36.0"
 compose-destinations = "1.11.7"
 shizuku = "13.1.5"
 hiddenapi = "4.4.0"
-compose-bom = "2025.11.00"
+compose-bom = "2025.12.01"
 kotlin = "2.2.21"
 ksp = "2.3.2"
 commons-io = "2.20.0"
diff --git a/manager/src/main/ic_launcher-playstore.png b/manager/src/main/ic_launcher-playstore.png
index 8ea1a48..e54b99a 100644
Binary files a/manager/src/main/ic_launcher-playstore.png and b/manager/src/main/ic_launcher-playstore.png differ
diff --git a/patch/build.gradle.kts b/patch/build.gradle.kts
index d0743bc..42abcb2 100644
--- a/patch/build.gradle.kts
+++ b/patch/build.gradle.kts
@@ -17,9 +17,9 @@ java {
 }
 
 dependencies {
-    implementation(projects.axml)
     implementation(projects.apkzlib)
     implementation(projects.share.java)
+    implementation(projects.external.axml)
 
     implementation(npatch.commons.io)
     implementation(npatch.beust.jcommander)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8562753..7c898dc 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -31,10 +31,10 @@ dependencyResolutionManagement {
 
 rootProject.name = "NPatch"
 include(
-    ":apache",
     ":apkzlib",
-    ":axml",
     ":core",
+    ":external:apache",
+    ":external:axml",
     ":hiddenapi:bridge",
     ":hiddenapi:stubs",
     ":jar",
@@ -47,15 +47,17 @@ include(
     ":services:xposed-service:interface",
     ":share:android",
     ":share:java",
+    ":xposed"
 )
 
-project(":apache").projectDir = file("core/apache")
-project(":axml").projectDir = file("core/axml")
 project(":core").projectDir = file("core/core")
+project(":external:apache").projectDir = file("core/external/apache")
+project(":external:axml").projectDir = file("core/external/axml")
 project(":hiddenapi:bridge").projectDir = file("core/hiddenapi/bridge")
 project(":hiddenapi:stubs").projectDir = file("core/hiddenapi/stubs")
 project(":services:daemon-service").projectDir = file("core/services/daemon-service")
 project(":services:manager-service").projectDir = file("core/services/manager-service")
 project(":services:xposed-service:interface").projectDir = file("core/services/xposed-service/interface")
+project(":xposed").projectDir = file("core/xposed")
 
 buildCache { local { removeUnusedEntriesAfterDays = 1 } }
\ No newline at end of file
diff --git a/share/java/src/main/java/org/lsposed/npatch/share/Constants.java b/share/java/src/main/java/org/lsposed/npatch/share/Constants.java
index 55546cd..487d9cd 100644
--- a/share/java/src/main/java/org/lsposed/npatch/share/Constants.java
+++ b/share/java/src/main/java/org/lsposed/npatch/share/Constants.java
@@ -6,7 +6,7 @@ public class Constants {
     final static public String LOADER_DEX_ASSET_PATH = "assets/npatch/loader.dex";
     final static public String META_LOADER_DEX_ASSET_PATH = "assets/npatch/metaloader.dex";
     final static public String PROVIDER_DEX_ASSET_PATH = "assets/npatch/mtprovider.dex";
-    final static public String ORIGINAL_APK_ASSET_PATH = "assets/npatch/origin.apk";
+    final static public String ORIGINAL_APK_ASSET_PATH = "assets/npatch/origin.apk.np";
     final static public String EMBEDDED_MODULES_ASSET_PATH = "assets/npatch/modules/";
 
     final static public String PATCH_FILE_SUFFIX = "-npatched.apk";