diff --git a/build.gradle b/build.gradle
index 36c10cf6..55d04099 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,12 @@ buildscript {
 allprojects {
     ext {
         templateRootPath = project(":edxp-core").projectDir.path + "/template_override/"
+        templateSystemPath = templateRootPath + "/system/"
+        templateSystemx86Path = templateRootPath + "/system_x86/"
         templateFrameworkPath = templateRootPath + "/system/framework/"
+        templateLibPath = templateRootPath + "/system/lib/"
+        templateLib64Path = templateRootPath + "/system/lib64/"
+        templateEtcPath = templateRootPath + "/system/etc/"
     }
     repositories {
         google()
diff --git a/edxp-core/.gitignore b/edxp-core/.gitignore
index 4780015e..bb940433 100644
--- a/edxp-core/.gitignore
+++ b/edxp-core/.gitignore
@@ -3,5 +3,6 @@
 /libs
 /obj
 /release
-/template_override/system/framework/edxp.jar
+/template_override/system
+/template_override/system_x86
 *.iml
\ No newline at end of file
diff --git a/edxp-core/build.gradle b/edxp-core/build.gradle
index 041302ce..e7fb4951 100644
--- a/edxp-core/build.gradle
+++ b/edxp-core/build.gradle
@@ -59,6 +59,10 @@ task copyDexmakerJar {
     }
 }
 
+task cleanTemplate(type: Delete) {
+    delete file(templateSystemPath), file(templateSystemx86Path)
+}
+
 afterEvaluate {
 
     android.libraryVariants.all { variant ->
@@ -72,7 +76,7 @@ afterEvaluate {
             def backendLowered = backend.toLowerCase()
 
             def zipTask = task("zip${backendCapped}${variantCapped}", type: Exec) {
-                dependsOn copyDalvikdxJar, copyDexmakerJar
+                dependsOn cleanTemplate, copyDalvikdxJar, copyDexmakerJar
                 dependsOn tasks.getByPath(":edxp-${backendLowered}:makeAndCopy${variantCapped}")
                 workingDir '..'
                 commandLine 'sh', 'build.sh', project.name,
diff --git a/edxp-sandhook/.gitignore b/edxp-sandhook/.gitignore
index 796b96d1..845f9980 100644
--- a/edxp-sandhook/.gitignore
+++ b/edxp-sandhook/.gitignore
@@ -1 +1,2 @@
 /build
+/template_override/system/framework/edxp.jar
\ No newline at end of file
diff --git a/edxp-sandhook/build.gradle b/edxp-sandhook/build.gradle
index 11decdc4..324b7621 100644
--- a/edxp-sandhook/build.gradle
+++ b/edxp-sandhook/build.gradle
@@ -54,10 +54,19 @@ afterEvaluate {
         def variantNameCapped = variant.name.capitalize()
         def variantNameLowered = variant.name.toLowerCase()
 
+        def myTemplatePath = "${projectDir}/template_override/"
+
         task("makeAndCopy${variantNameCapped}", type: Jar, dependsOn: "assemble${variantNameCapped}") {
             from "${buildDir}/intermediates/dex/${variantNameLowered}/mergeDex${variantNameCapped}/out/"
-            destinationDir file(templateFrameworkPath)
+            destinationDir file(myTemplatePath + "system/framework/")
             baseName "edxp"
+            doLast {
+                copy {
+                    from file(myTemplatePath)
+                    into file(templateRootPath)
+                }
+            }
+            outputs.upToDateWhen { false }
         }
     }
 }
\ No newline at end of file
diff --git a/edxp-core/template_override/system/etc/public.libraries-edxp.txt b/edxp-sandhook/template_override/system/etc/public.libraries-edxp.txt
similarity index 54%
rename from edxp-core/template_override/system/etc/public.libraries-edxp.txt
rename to edxp-sandhook/template_override/system/etc/public.libraries-edxp.txt
index 03b2c76d..3c8badba 100644
--- a/edxp-core/template_override/system/etc/public.libraries-edxp.txt
+++ b/edxp-sandhook/template_override/system/etc/public.libraries-edxp.txt
@@ -1,2 +1 @@
 libsandhook.edxp.so
-libwhale.edxp.so
diff --git a/edxp-sandhook/template_override/system/framework/edconfig.jar b/edxp-sandhook/template_override/system/framework/edconfig.jar
new file mode 100644
index 00000000..c05f83e5
--- /dev/null
+++ b/edxp-sandhook/template_override/system/framework/edconfig.jar
@@ -0,0 +1,5 @@
+version=90.0-sandhook-0.3.1.6-beta-SNAPSHOT
+arch=arm64
+minsdk=23
+maxsdk=28
+requires:fbe_aware=1
diff --git a/edxp-core/template_override/system/lib/libsandhook.edxp.so b/edxp-sandhook/template_override/system/lib/libsandhook.edxp.so
similarity index 100%
rename from edxp-core/template_override/system/lib/libsandhook.edxp.so
rename to edxp-sandhook/template_override/system/lib/libsandhook.edxp.so
diff --git a/edxp-core/template_override/system/lib/libwhale.edxp.so b/edxp-sandhook/template_override/system/lib/libwhale.edxp.so
similarity index 100%
rename from edxp-core/template_override/system/lib/libwhale.edxp.so
rename to edxp-sandhook/template_override/system/lib/libwhale.edxp.so
diff --git a/edxp-core/template_override/system/lib64/libsandhook.edxp.so b/edxp-sandhook/template_override/system/lib64/libsandhook.edxp.so
similarity index 100%
rename from edxp-core/template_override/system/lib64/libsandhook.edxp.so
rename to edxp-sandhook/template_override/system/lib64/libsandhook.edxp.so
diff --git a/edxp-core/template_override/system/lib64/libwhale.edxp.so b/edxp-sandhook/template_override/system/lib64/libwhale.edxp.so
similarity index 100%
rename from edxp-core/template_override/system/lib64/libwhale.edxp.so
rename to edxp-sandhook/template_override/system/lib64/libwhale.edxp.so
diff --git a/edxp-core/template_override/system_x86/lib/libwhale.edxp.so b/edxp-sandhook/template_override/system_x86/lib/libwhale.edxp.so
similarity index 100%
rename from edxp-core/template_override/system_x86/lib/libwhale.edxp.so
rename to edxp-sandhook/template_override/system_x86/lib/libwhale.edxp.so
diff --git a/edxp-core/template_override/system_x86/lib64/libwhale.edxp.so b/edxp-sandhook/template_override/system_x86/lib64/libwhale.edxp.so
similarity index 100%
rename from edxp-core/template_override/system_x86/lib64/libwhale.edxp.so
rename to edxp-sandhook/template_override/system_x86/lib64/libwhale.edxp.so
diff --git a/edxp-whale/.gitignore b/edxp-whale/.gitignore
index 796b96d1..845f9980 100644
--- a/edxp-whale/.gitignore
+++ b/edxp-whale/.gitignore
@@ -1 +1,2 @@
 /build
+/template_override/system/framework/edxp.jar
\ No newline at end of file
diff --git a/edxp-whale/build.gradle b/edxp-whale/build.gradle
index 5e5c5e0b..8ca2d21f 100644
--- a/edxp-whale/build.gradle
+++ b/edxp-whale/build.gradle
@@ -52,10 +52,19 @@ afterEvaluate {
         def variantNameCapped = variant.name.capitalize()
         def variantNameLowered = variant.name.toLowerCase()
 
+        def myTemplatePath = "${projectDir}/template_override/"
+
         task("makeAndCopy${variantNameCapped}", type: Jar, dependsOn: "assemble${variantNameCapped}") {
             from "${buildDir}/intermediates/dex/${variantNameLowered}/mergeDex${variantNameCapped}/out/"
-            destinationDir file(templateFrameworkPath)
+            destinationDir file(myTemplatePath + "system/framework/")
             baseName "edxp"
+            doLast {
+                copy {
+                    from file(myTemplatePath)
+                    into file(templateRootPath)
+                }
+            }
+            outputs.upToDateWhen { false }
         }
     }
 }
\ No newline at end of file
diff --git a/edxp-whale/template_override/system/etc/public.libraries-edxp.txt b/edxp-whale/template_override/system/etc/public.libraries-edxp.txt
new file mode 100644
index 00000000..55a4cc17
--- /dev/null
+++ b/edxp-whale/template_override/system/etc/public.libraries-edxp.txt
@@ -0,0 +1 @@
+libwhale.edxp.so
diff --git a/edxp-core/template_override/system/framework/edconfig.jar b/edxp-whale/template_override/system/framework/edconfig.jar
similarity index 55%
rename from edxp-core/template_override/system/framework/edconfig.jar
rename to edxp-whale/template_override/system/framework/edconfig.jar
index ce0a3ce2..8823ba2c 100644
--- a/edxp-core/template_override/system/framework/edconfig.jar
+++ b/edxp-whale/template_override/system/framework/edconfig.jar
@@ -1,4 +1,4 @@
-version=90.0-0.3.1.6-beta-SNAPSHOT
+version=90.0-0.3.1.6-whale-beta-SNAPSHOT
 arch=arm64
 minsdk=23
 maxsdk=28
diff --git a/edxp-whale/template_override/system/lib/libwhale.edxp.so b/edxp-whale/template_override/system/lib/libwhale.edxp.so
new file mode 100755
index 00000000..187d0495
Binary files /dev/null and b/edxp-whale/template_override/system/lib/libwhale.edxp.so differ
diff --git a/edxp-whale/template_override/system/lib64/libwhale.edxp.so b/edxp-whale/template_override/system/lib64/libwhale.edxp.so
new file mode 100755
index 00000000..3c2cd0d8
Binary files /dev/null and b/edxp-whale/template_override/system/lib64/libwhale.edxp.so differ
diff --git a/edxp-whale/template_override/system_x86/lib/libwhale.edxp.so b/edxp-whale/template_override/system_x86/lib/libwhale.edxp.so
new file mode 100755
index 00000000..d1653bcc
Binary files /dev/null and b/edxp-whale/template_override/system_x86/lib/libwhale.edxp.so differ
diff --git a/edxp-whale/template_override/system_x86/lib64/libwhale.edxp.so b/edxp-whale/template_override/system_x86/lib64/libwhale.edxp.so
new file mode 100755
index 00000000..f5bcdc5a
Binary files /dev/null and b/edxp-whale/template_override/system_x86/lib64/libwhale.edxp.so differ
diff --git a/edxp-yahfa/.gitignore b/edxp-yahfa/.gitignore
index 796b96d1..845f9980 100644
--- a/edxp-yahfa/.gitignore
+++ b/edxp-yahfa/.gitignore
@@ -1 +1,2 @@
 /build
+/template_override/system/framework/edxp.jar
\ No newline at end of file
diff --git a/edxp-yahfa/build.gradle b/edxp-yahfa/build.gradle
index 23b7591d..b3dff3ed 100644
--- a/edxp-yahfa/build.gradle
+++ b/edxp-yahfa/build.gradle
@@ -53,10 +53,19 @@ afterEvaluate {
         def variantNameCapped = variant.name.capitalize()
         def variantNameLowered = variant.name.toLowerCase()
 
+        def myTemplatePath = "${projectDir}/template_override/"
+
         task("makeAndCopy${variantNameCapped}", type: Jar, dependsOn: "assemble${variantNameCapped}") {
             from "${buildDir}/intermediates/dex/${variantNameLowered}/mergeDex${variantNameCapped}/out/"
-            destinationDir file(templateFrameworkPath)
+            destinationDir file(myTemplatePath + "system/framework/")
             baseName "edxp"
+            doLast {
+                copy {
+                    from file(myTemplatePath)
+                    into file(templateRootPath)
+                }
+            }
+            outputs.upToDateWhen { false }
         }
     }
 }
\ No newline at end of file
diff --git a/edxp-yahfa/template_override/system/framework/edconfig.jar b/edxp-yahfa/template_override/system/framework/edconfig.jar
new file mode 100644
index 00000000..52afb4a1
--- /dev/null
+++ b/edxp-yahfa/template_override/system/framework/edconfig.jar
@@ -0,0 +1,5 @@
+version=90.0-yahfa-0.3.1.6-beta-SNAPSHOT
+arch=arm64
+minsdk=23
+maxsdk=28
+requires:fbe_aware=1
diff --git a/edxp-yahfa/template_override/system/lib/libwhale.edxp.so b/edxp-yahfa/template_override/system/lib/libwhale.edxp.so
new file mode 100755
index 00000000..187d0495
Binary files /dev/null and b/edxp-yahfa/template_override/system/lib/libwhale.edxp.so differ
diff --git a/edxp-yahfa/template_override/system/lib64/libwhale.edxp.so b/edxp-yahfa/template_override/system/lib64/libwhale.edxp.so
new file mode 100755
index 00000000..3c2cd0d8
Binary files /dev/null and b/edxp-yahfa/template_override/system/lib64/libwhale.edxp.so differ
diff --git a/edxp-yahfa/template_override/system_x86/lib/libwhale.edxp.so b/edxp-yahfa/template_override/system_x86/lib/libwhale.edxp.so
new file mode 100755
index 00000000..d1653bcc
Binary files /dev/null and b/edxp-yahfa/template_override/system_x86/lib/libwhale.edxp.so differ
diff --git a/edxp-yahfa/template_override/system_x86/lib64/libwhale.edxp.so b/edxp-yahfa/template_override/system_x86/lib64/libwhale.edxp.so
new file mode 100755
index 00000000..f5bcdc5a
Binary files /dev/null and b/edxp-yahfa/template_override/system_x86/lib64/libwhale.edxp.so differ