diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
deleted file mode 100644
index fc2aa09..0000000
--- a/.github/workflows/shellcheck.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-on: [push, pull_request]
-
-name: ShellCheck
-
-jobs:
-  shellcheck:
-    name: Shellcheck
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - name: Run ShellCheck
-        uses: ludeeus/action-shellcheck@master
-    
diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml
deleted file mode 100644
index 0eb9c55..0000000
--- a/.github/workflows/updater.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Updater
-on:
-  schedule:
-    - cron:  '37 13 * * *'
-  workflow_dispatch:
-jobs:
-  Update-Apks:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-      - run: pipx install pipenv
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.9'
-          cache: 'pipenv'
-          cache-dependency-path: 'updater/Pipfile.lock'
-      - run: pipenv install
-        working-directory: updater
-      - run: pipenv run python main.py
-        working-directory: updater
diff --git a/FDroid/.version_code b/apps/FDroid/.version_code
similarity index 100%
rename from FDroid/.version_code
rename to apps/FDroid/.version_code
diff --git a/FDroid/Android.mk b/apps/FDroid/Android.mk
similarity index 94%
rename from FDroid/Android.mk
rename to apps/FDroid/Android.mk
index 3f0430a..cb75a67 100644
--- a/FDroid/Android.mk
+++ b/apps/FDroid/Android.mk
@@ -10,4 +10,5 @@ ifneq ($(call math_gt_or_eq, $(PLATFORM_SDK_VERSION), 31),)
 LOCAL_OPTIONAL_USES_LIBRARIES := androidx.window.extensions androidx.window.sidecar
 endif
 LOCAL_PRODUCT_MODULE := true
+LOCAL_DEX_PREOPT := false
 include $(BUILD_PREBUILT)
diff --git a/FDroidPrivilegedExtension/.version_code b/apps/FDroidPrivilegedExtension/.version_code
similarity index 100%
rename from FDroidPrivilegedExtension/.version_code
rename to apps/FDroidPrivilegedExtension/.version_code
diff --git a/FDroidPrivilegedExtension/Android.mk b/apps/FDroidPrivilegedExtension/Android.mk
similarity index 96%
rename from FDroidPrivilegedExtension/Android.mk
rename to apps/FDroidPrivilegedExtension/Android.mk
index 3c0cd63..c0aaf7a 100644
--- a/FDroidPrivilegedExtension/Android.mk
+++ b/apps/FDroidPrivilegedExtension/Android.mk
@@ -16,5 +16,6 @@ LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_REQUIRED_MODULES := privapp-permissions-org.fdroid.fdroid.privileged.xml
 LOCAL_PRODUCT_MODULE := true
+LOCAL_DEX_PREOPT := false
 include $(BUILD_PREBUILT)
 
diff --git a/FDroidPrivilegedExtension/privapp-permissions-org.fdroid.fdroid.privileged.xml b/apps/FDroidPrivilegedExtension/privapp-permissions-org.fdroid.fdroid.privileged.xml
similarity index 100%
rename from FDroidPrivilegedExtension/privapp-permissions-org.fdroid.fdroid.privileged.xml
rename to apps/FDroidPrivilegedExtension/privapp-permissions-org.fdroid.fdroid.privileged.xml
diff --git a/FakeStore/.version_code b/apps/FakeStore/.version_code
similarity index 100%
rename from FakeStore/.version_code
rename to apps/FakeStore/.version_code
diff --git a/FakeStore/Android.mk b/apps/FakeStore/Android.mk
similarity index 97%
rename from FakeStore/Android.mk
rename to apps/FakeStore/Android.mk
index 285b126..3a97c28 100644
--- a/FakeStore/Android.mk
+++ b/apps/FakeStore/Android.mk
@@ -27,6 +27,6 @@ LOCAL_PRODUCT_MODULE := true
 ifneq ($(call math_gt_or_eq, $(PLATFORM_SDK_VERSION), 31),)
 LOCAL_OPTIONAL_USES_LIBRARIES := androidx.window.extensions androidx.window.sidecar
 endif
-
+LOCAL_DEX_PREOPT := false
 include $(BUILD_PREBUILT)
 
diff --git a/FakeStore/default-permissions-com.android.vending.xml b/apps/FakeStore/default-permissions-com.android.vending.xml
similarity index 100%
rename from FakeStore/default-permissions-com.android.vending.xml
rename to apps/FakeStore/default-permissions-com.android.vending.xml
diff --git a/FakeStore/privapp-permissions-com.android.vending.xml b/apps/FakeStore/privapp-permissions-com.android.vending.xml
similarity index 100%
rename from FakeStore/privapp-permissions-com.android.vending.xml
rename to apps/FakeStore/privapp-permissions-com.android.vending.xml
diff --git a/GmsCore/.version_code b/apps/GmsCore/.version_code
similarity index 100%
rename from GmsCore/.version_code
rename to apps/GmsCore/.version_code
diff --git a/GmsCore/Android.mk b/apps/GmsCore/Android.mk
similarity index 98%
rename from GmsCore/Android.mk
rename to apps/GmsCore/Android.mk
index e3745b6..f46ad93 100644
--- a/GmsCore/Android.mk
+++ b/apps/GmsCore/Android.mk
@@ -35,7 +35,6 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := GmsCore
 LOCAL_SRC_FILES := GmsCore.apk
 LOCAL_MODULE_CLASS := APPS
-LOCAL_PRODUCT_MODULE := true
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_CERTIFICATE := PRESIGNED
diff --git a/GmsCore/default-permissions-com.google.android.gms.xml b/apps/GmsCore/default-permissions-com.google.android.gms.xml
similarity index 100%
rename from GmsCore/default-permissions-com.google.android.gms.xml
rename to apps/GmsCore/default-permissions-com.google.android.gms.xml
diff --git a/GmsCore/microg.xml b/apps/GmsCore/microg.xml
similarity index 100%
rename from GmsCore/microg.xml
rename to apps/GmsCore/microg.xml
diff --git a/GmsCore/privapp-permissions-com.google.android.gms.xml b/apps/GmsCore/privapp-permissions-com.google.android.gms.xml
similarity index 100%
rename from GmsCore/privapp-permissions-com.google.android.gms.xml
rename to apps/GmsCore/privapp-permissions-com.google.android.gms.xml
diff --git a/GmsCore/sysconfig-com.google.android.gms.xml b/apps/GmsCore/sysconfig-com.google.android.gms.xml
similarity index 100%
rename from GmsCore/sysconfig-com.google.android.gms.xml
rename to apps/GmsCore/sysconfig-com.google.android.gms.xml
diff --git a/GsfProxy/.version_code b/apps/GsfProxy/.version_code
similarity index 100%
rename from GsfProxy/.version_code
rename to apps/GsfProxy/.version_code
diff --git a/GsfProxy/Android.mk b/apps/GsfProxy/Android.mk
similarity index 73%
rename from GsfProxy/Android.mk
rename to apps/GsfProxy/Android.mk
index 248d922..1a2ac35 100644
--- a/GsfProxy/Android.mk
+++ b/apps/GsfProxy/Android.mk
@@ -6,4 +6,6 @@ LOCAL_MODULE_CLASS := APPS
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_PRODUCT_MODULE := true
+LOCAL_DEX_PREOPT := false
+LOCAL_REPLACE_PREBUILT_APK_INSTALLED := $(LOCAL_PATH)/$(LOCAL_MODULE).apk
 include $(BUILD_PREBUILT)