diff --git a/HwCamera2/Android.mk b/HwCamera2/Android.mk
index 4252cc3..dc0aa35 100644
--- a/HwCamera2/Android.mk
+++ b/HwCamera2/Android.mk
@@ -16,20 +16,15 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),berkeley)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := HwCamera2
 LOCAL_MODULE_OWNER := huawei
-LOCAL_SRC_FILES := proprietary/priv-app/HwCamera2/HwCamera2.apk
-LOCAL_CERTIFICATE := platform
+LOCAL_SRC_FILES := HwCamera2.apk
+LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
 LOCAL_DEX_PREOPT := false
 LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
-LOCAL_OVERRIDES_PACKAGES := Camera2
-LOCAL_OVERRIDES_PACKAGES := Snap
+#LOCAL_OVERRIDES_PACKAGES := Snap
 include $(BUILD_PREBUILT)
-
-endif
diff --git a/MotoCamera2/Android.mk b/MotCamera2/Android.mk
similarity index 85%
rename from MotoCamera2/Android.mk
rename to MotCamera2/Android.mk
index a7886ef..5278909 100644
--- a/MotoCamera2/Android.mk
+++ b/MotCamera2/Android.mk
@@ -16,20 +16,15 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),nash)
-
 include $(CLEAR_VARS)
-LOCAL_MODULE := MotoCamera2
+LOCAL_MODULE := MotCamera2
 LOCAL_MODULE_OWNER := motorola
-LOCAL_SRC_FILES := proprietary/priv-app/MotoCamera2/MotoCamera2.apk
+LOCAL_SRC_FILES := MotCamera2.apk
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
 LOCAL_DEX_PREOPT := false
 LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
-LOCAL_OVERRIDES_PACKAGES := Camera2
 LOCAL_OVERRIDES_PACKAGES := Snap
 include $(BUILD_PREBUILT)
-
-endif
diff --git a/MotoCamera2/base.apk b/MotCamera2/MotCamera2.apk
similarity index 100%
rename from MotoCamera2/base.apk
rename to MotCamera2/MotCamera2.apk
diff --git a/MotoCamera2/HwCamera2.apk b/MotoCamera2/HwCamera2.apk
deleted file mode 100644
index bcd6bfd..0000000
Binary files a/MotoCamera2/HwCamera2.apk and /dev/null differ
diff --git a/MotoCamera2/lib/arm/libHW_Pano_f.so b/MotoCamera2/lib/arm/libHW_Pano_f.so
deleted file mode 100644
index 40b99b6..0000000
Binary files a/MotoCamera2/lib/arm/libHW_Pano_f.so and /dev/null differ
diff --git a/MotoCamera2/lib/arm/libHwPostCamera_jni.so b/MotoCamera2/lib/arm/libHwPostCamera_jni.so
deleted file mode 100644
index d29ca98..0000000
Binary files a/MotoCamera2/lib/arm/libHwPostCamera_jni.so and /dev/null differ
diff --git a/MotoCamera2/lib/arm/libIvw35.so b/MotoCamera2/lib/arm/libIvw35.so
deleted file mode 100644
index 5cb2060..0000000
Binary files a/MotoCamera2/lib/arm/libIvw35.so and /dev/null differ
diff --git a/MotoCamera2/lib/arm/libJniVoiceCapture.so b/MotoCamera2/lib/arm/libJniVoiceCapture.so
deleted file mode 100644
index 4d5d026..0000000
Binary files a/MotoCamera2/lib/arm/libJniVoiceCapture.so and /dev/null differ
diff --git a/MotoCamera2/lib/arm/libTargetTracking.so b/MotoCamera2/lib/arm/libTargetTracking.so
deleted file mode 100644
index e2b1b75..0000000
Binary files a/MotoCamera2/lib/arm/libTargetTracking.so and /dev/null differ
diff --git a/MotoCamera2/lib/arm/libfyusenet.so b/MotoCamera2/lib/arm/libfyusenet.so
deleted file mode 100644
index 4d3c648..0000000
Binary files a/MotoCamera2/lib/arm/libfyusenet.so and /dev/null differ
diff --git a/MotoCamera2/lib/arm/libgif_maker.so b/MotoCamera2/lib/arm/libgif_maker.so
deleted file mode 100644
index 968aad9..0000000
Binary files a/MotoCamera2/lib/arm/libgif_maker.so and /dev/null differ
diff --git a/MotoCamera2/lib/arm/libjni_front_panorama_beauty_hidl.so b/MotoCamera2/lib/arm/libjni_front_panorama_beauty_hidl.so
deleted file mode 100644
index a4fcaa5..0000000
Binary files a/MotoCamera2/lib/arm/libjni_front_panorama_beauty_hidl.so and /dev/null differ
diff --git a/MotoCamera2/lib/arm/libjni_front_panorama_camera2.so b/MotoCamera2/lib/arm/libjni_front_panorama_camera2.so
deleted file mode 100644
index 742ce67..0000000
Binary files a/MotoCamera2/lib/arm/libjni_front_panorama_camera2.so and /dev/null differ
diff --git a/MotoCamera2/lib/arm/libjni_mrc_cg_filters_camera2.so b/MotoCamera2/lib/arm/libjni_mrc_cg_filters_camera2.so
deleted file mode 100644
index fd19051..0000000
Binary files a/MotoCamera2/lib/arm/libjni_mrc_cg_filters_camera2.so and /dev/null differ
diff --git a/MotoCamera2/lib/arm/libmorpho_memory_allocator.so b/MotoCamera2/lib/arm/libmorpho_memory_allocator.so
deleted file mode 100644
index 6553c5d..0000000
Binary files a/MotoCamera2/lib/arm/libmorpho_memory_allocator.so and /dev/null differ
diff --git a/MotoCamera2/lib/arm/libmorpho_panorama_gp.so b/MotoCamera2/lib/arm/libmorpho_panorama_gp.so
deleted file mode 100644
index 71244c8..0000000
Binary files a/MotoCamera2/lib/arm/libmorpho_panorama_gp.so and /dev/null differ
diff --git a/MotoCamera2/lib/arm/libscanner.so b/MotoCamera2/lib/arm/libscanner.so
deleted file mode 100644
index 943b534..0000000
Binary files a/MotoCamera2/lib/arm/libscanner.so and /dev/null differ
diff --git a/MotoCamera2/lib/arm/libtrack.so b/MotoCamera2/lib/arm/libtrack.so
deleted file mode 100644
index aa93dd8..0000000
Binary files a/MotoCamera2/lib/arm/libtrack.so and /dev/null differ
diff --git a/MotoCamera2/lib/arm/vendor.huawei.hardware.camera.cfgsvr@1.0.so b/MotoCamera2/lib/arm/vendor.huawei.hardware.camera.cfgsvr@1.0.so
deleted file mode 100644
index d0c39b5..0000000
Binary files a/MotoCamera2/lib/arm/vendor.huawei.hardware.camera.cfgsvr@1.0.so and /dev/null differ
diff --git a/MotoCamera2/lib/arm/vendor.huawei.hardware.camera.cfgsvr@1.1.so b/MotoCamera2/lib/arm/vendor.huawei.hardware.camera.cfgsvr@1.1.so
deleted file mode 100644
index 483018e..0000000
Binary files a/MotoCamera2/lib/arm/vendor.huawei.hardware.camera.cfgsvr@1.1.so and /dev/null differ
diff --git a/gapps.mk b/gapps.mk
index 40452e6..1531c28 100644
--- a/gapps.mk
+++ b/gapps.mk
@@ -15,11 +15,12 @@ PICO_GAPPS_DEVICES += \
     %jfltexx \
     %yellowstone
 
+FLASH_GAPPS_DEVICES += \
+    %flo
+
 EXCLUDE_GOOGLE_SYSUI_DEVICES += \
-    %flo \
     %foster \
     %fugu \
-    %m8 \
     %tv_molly
 
 GAPPS_DEVICES += \
@@ -27,8 +28,15 @@ GAPPS_DEVICES += \
     $(MOST_GAPPS_DEVICES) \
     $(NANO_GAPPS_DEVICES) \
     $(PICO_GAPPS_DEVICES) \
+    $(FLASH_GAPPS_DEVICES) \
     $(PIXEL_CODENAMES)
 
+ifneq ($(filter $(EXCLUDE_GOOGLE_SYSUI_DEVICES),$(TARGET_PRODUCT)),)
+PRODUCT_PACKAGES += \
+    FDroid \
+    FDroid-Privledged
+endif
+
 ifneq ($(filter $(PIXEL_CODENAMES),$(TARGET_PRODUCT)),)
 GAPPS_VARIANT := stock
 GAPPS_FORCE_PACKAGE_OVERRIDES := true
diff --git a/product.mk b/product.mk
index 120c05b..0e2cf82 100644
--- a/product.mk
+++ b/product.mk
@@ -17,14 +17,32 @@ PRODUCT_PROPERTY_OVERRIDES += lineage.updater.uri="http://updater.oddsolutions.u
 PRODUCT_COPY_FILES += \
     vendor/extra/adb_keys:recovery/root/adb_keys
 
-ifneq ($(filter berkeley,$(TARGET_PRODUCT)),)
+ifneq ($(filter %berkeley,$(TARGET_PRODUCT)),)
 PRODUCT_PACKAGES += \
     HwCamera2
+
+PRODUCT_COPY_FILES := \
+    vendor/extra/HwCamera2/lib/arm/libfyusenet.so:system/priv-app/HwCamera2/lib/arm/libfyusenet.so \
+    vendor/extra/HwCamera2/lib/arm/libgif_maker.so:system/priv-app/HwCamera2/lib/arm/libgif_maker.so \
+    vendor/extra/HwCamera2/lib/arm/libHW_Pano_f.so:system/priv-app/HwCamera2/lib/arm/libHW_Pano_f.so \
+    vendor/extra/HwCamera2/lib/arm/libHwPostCamera_jni.so:system/priv-app/HwCamera2/lib/arm/libHwPostCamera_jni.so \
+    vendor/extra/HwCamera2/lib/arm/libIvw35.so:system/priv-app/HwCamera2/lib/arm/libIvw35.so \
+    vendor/extra/HwCamera2/lib/arm/libjni_front_panorama_beauty_hidl.so:system/priv-app/HwCamera2/lib/arm/libjni_front_panorama_beauty_hidl.so \
+    vendor/extra/HwCamera2/lib/arm/libjni_front_panorama_camera2.so:system/priv-app/HwCamera2/lib/arm/libjni_front_panorama_camera2.so \
+    vendor/extra/HwCamera2/lib/arm/libjni_mrc_cg_filters_camera2.so:system/priv-app/HwCamera2/lib/arm/libjni_mrc_cg_filters_camera2.so \
+    vendor/extra/HwCamera2/lib/arm/libJniVoiceCapture.so:system/priv-app/HwCamera2/lib/arm/libJniVoiceCapture.so \
+    vendor/extra/HwCamera2/lib/arm/libmorpho_memory_allocator.so:system/priv-app/HwCamera2/lib/arm/libmorpho_memory_allocator.so \ 
+    vendor/extra/HwCamera2/lib/arm/libmorpho_panorama_gp.so:system/priv-app/HwCamera2/lib/arm/libmorpho_panorama_gp.so \
+    vendor/extra/HwCamera2/lib/arm/libscanner.so:system/priv-app/HwCamera2/lib/arm/libscanner.so \
+    vendor/extra/HwCamera2/lib/arm/libTargetTracking.so:system/priv-app/HwCamera2/lib/arm/libTargetTracking.so \
+    vendor/extra/HwCamera2/lib/arm/libtrack.so:system/priv-app/HwCamera2/lib/arm/libtrack.so \
+    vendor/extra/HwCamera2/lib/arm/vendor.huawei.hardware.camera.cfgsvr@1.0.so:system/priv-app/HwCamera2/lib/arm/vendor.huawei.hardware.camera.cfgsvr@1.0.so \
+    vendor/extra/HwCamera2/lib/arm/vendor.huawei.hardware.camera.cfgsvr@1.1.so:system/priv-app/HwCamera2/lib/arm/vendor.huawei.hardware.camera.cfgsvr@1.1.so
 endif
 
-ifneq ($(filter nash,$(TARGET_PRODUCT)),)
+ifneq ($(filter %nash,$(TARGET_PRODUCT)),)
 PRODUCT_PACKAGES += \
-    MotoCamera2
+    MotCamera2
 endif
 
 -include vendor/google_pixel/product.mk