diff --git a/Android.bp b/Android.bp
index 3aa907b..d1ba156 100644
--- a/Android.bp
+++ b/Android.bp
@@ -108,12 +108,36 @@ android_app_import {
 	system_ext_specific: true,
 }
 
+android_app_import {
+	name: "daxService",
+	owner: "motorola",
+	apk: "proprietary/system_ext/priv-app/daxService/daxService.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "com.motorola.frameworks.core.addon",
+	owner: "motorola",
+	jars: ["proprietary/system/framework/com.motorola.frameworks.core.addon.jar"],
+}
+
 dex_import {
 	name: "com.motorola.motosignature",
 	owner: "motorola",
 	jars: ["proprietary/system/framework/com.motorola.motosignature.jar"],
 }
 
+dex_import {
+	name: "moto-checkin",
+	owner: "motorola",
+	jars: ["proprietary/system/framework/moto-checkin.jar"],
+}
+
 dex_import {
 	name: "moto-core_services",
 	owner: "motorola",
@@ -126,6 +150,12 @@ dex_import {
 	jars: ["proprietary/system/framework/moto-settings.jar"],
 }
 
+dex_import {
+	name: "motoaudioeffectsdk",
+	owner: "motorola",
+	jars: ["proprietary/system/framework/motoaudioeffectsdk.jar"],
+}
+
 dex_import {
 	name: "com.android.hotwordenrollment.common.util",
 	owner: "motorola",
@@ -140,7 +170,6 @@ prebuilt_etc_xml {
 	filename_from_src: true,
 	sub_dir: "vintf/manifest",
 	soc_specific: true,
-
 }
 
 cc_prebuilt_binary {
@@ -179,32 +208,3 @@ cc_prebuilt_binary {
 	soc_specific: true,
 }
 
-android_app_import {
-	name: "daxService",
-	owner: "motorola",
-	apk: "proprietary/system_ext/priv-app/daxService/daxService.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "com.motorola.frameworks.core.addon",
-	owner: "motorola",
-	jars: ["proprietary/system/framework/com.motorola.frameworks.core.addon.jar"],
-}
-
-dex_import {
-	name: "moto-checkin",
-	owner: "motorola",
-	jars: ["proprietary/system/framework/moto-checkin.jar"],
-}
-
-	dex_import {
-	name: "motoaudioeffectsdk",
-	owner: "motorola",
-	jars: ["proprietary/system/framework/motoaudioeffectsdk.jar"],
-}
diff --git a/eqs-vendor.mk b/eqs-vendor.mk
index 2b8c8a5..6af2d29 100644
--- a/eqs-vendor.mk
+++ b/eqs-vendor.mk
@@ -22,10 +22,10 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/eqs/proprietary/system/etc/permissions/moto-checkin.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/moto-checkin.xml \
     vendor/motorola/eqs/proprietary/system/etc/permissions/moto-core_services.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/moto-core_services.xml \
     vendor/motorola/eqs/proprietary/system/etc/permissions/moto-settings.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/moto-settings.xml \
-    vendor/motorola/eqs/proprietary/system_ext/bin/motsettings:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/motsettings \
-    vendor/motorola/eqs/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.android.hotwordenrollment.common.util.xml \
     vendor/motorola/eqs/proprietary/system/etc/permissions/motoaudioeffectsdk.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/motoaudioeffectsdk.xml \
     vendor/motorola/eqs/proprietary/system/etc/sysconfig/hiddenapi-whitelist-com.motorola.dolby.dolbyui.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/hiddenapi-whitelist-com.motorola.dolby.dolbyui.xml \
+    vendor/motorola/eqs/proprietary/system_ext/bin/motsettings:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/motsettings \
+    vendor/motorola/eqs/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.android.hotwordenrollment.common.util.xml \
     vendor/motorola/eqs/proprietary/system_ext/etc/permissions/com.dolby.daxservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.dolby.daxservice.xml \
     vendor/motorola/eqs/proprietary/vendor/bin/STFlashTool:$(TARGET_COPY_OUT_VENDOR)/bin/STFlashTool \
     vendor/motorola/eqs/proprietary/vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-ets:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-ets \
@@ -662,19 +662,19 @@ PRODUCT_PACKAGES += \
     android.hardware.secure_element@1.0-impl-gto \
     MotoDolbyDax3 \
     MotoSignatureApp \
-    daxService \
-    motoaudioeffectsdk \
-    com.motorola.frameworks.core.addon \
-    moto-checkin \
     MotCamera3AI \
     HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND \
     HotwordEnrollmentXGoogleHEXAGON_WIDEBAND \
     MotCamera4 \
     MotorolaSettingsProvider \
+    daxService \
+    com.motorola.frameworks.core.addon \
     com.motorola.motosignature \
+    moto-checkin \
     moto-core_services \
     moto-settings \
+    motoaudioeffectsdk \
     com.android.hotwordenrollment.common.util \
     motorola.hardware.sensorext.service \
     android.hardware.nfc@1.2-service.st \
-    android.hardware.secure_element@1.2-service-gto
\ No newline at end of file
+    android.hardware.secure_element@1.2-service-gto
diff --git a/proprietary/system/app/MotoDolbyDax3/MotoDolbyDax3.apk b/proprietary/system/app/MotoDolbyDax3/MotoDolbyDax3.apk
index aec8e7d..102693d 100644
Binary files a/proprietary/system/app/MotoDolbyDax3/MotoDolbyDax3.apk and b/proprietary/system/app/MotoDolbyDax3/MotoDolbyDax3.apk differ
diff --git a/proprietary/system/framework/com.motorola.frameworks.core.addon.jar b/proprietary/system/framework/com.motorola.frameworks.core.addon.jar
index c055833..e0e203b 100644
Binary files a/proprietary/system/framework/com.motorola.frameworks.core.addon.jar and b/proprietary/system/framework/com.motorola.frameworks.core.addon.jar differ
diff --git a/proprietary/system/framework/moto-checkin.jar b/proprietary/system/framework/moto-checkin.jar
index 60ad7fd..206df94 100644
Binary files a/proprietary/system/framework/moto-checkin.jar and b/proprietary/system/framework/moto-checkin.jar differ
diff --git a/proprietary/system/framework/motoaudioeffectsdk.jar b/proprietary/system/framework/motoaudioeffectsdk.jar
index bc14b09..c8ee14a 100644
Binary files a/proprietary/system/framework/motoaudioeffectsdk.jar and b/proprietary/system/framework/motoaudioeffectsdk.jar differ