diff --git a/universal7885-common/eklogger/Android.bp b/universal7885-common/bin/eklogger/Android.bp
similarity index 100%
rename from universal7885-common/eklogger/Android.bp
rename to universal7885-common/bin/eklogger/Android.bp
diff --git a/universal7885-common/eklogger/Logger.cpp b/universal7885-common/bin/eklogger/Logger.cpp
similarity index 100%
rename from universal7885-common/eklogger/Logger.cpp
rename to universal7885-common/bin/eklogger/Logger.cpp
diff --git a/universal7885-common/eklogger/eklogger.rc b/universal7885-common/bin/eklogger/eklogger.rc
similarity index 100%
rename from universal7885-common/eklogger/eklogger.rc
rename to universal7885-common/bin/eklogger/eklogger.rc
diff --git a/universal7885-common/hardware/interfaces/Android.bp b/universal7885-common/bin/hardware/interfaces/Android.bp
similarity index 100%
rename from universal7885-common/hardware/interfaces/Android.bp
rename to universal7885-common/bin/hardware/interfaces/Android.bp
diff --git a/universal7885-common/hardware/interfaces/hardware/fmradio/1.0/Android.bp b/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.0/Android.bp
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/fmradio/1.0/Android.bp
rename to universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.0/Android.bp
diff --git a/universal7885-common/hardware/interfaces/hardware/fmradio/1.0/IFMRadio.hal b/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.0/IFMRadio.hal
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/fmradio/1.0/IFMRadio.hal
rename to universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.0/IFMRadio.hal
diff --git a/universal7885-common/hardware/interfaces/hardware/fmradio/1.0/types.hal b/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.0/types.hal
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/fmradio/1.0/types.hal
rename to universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.0/types.hal
diff --git a/universal7885-common/hardware/interfaces/hardware/fmradio/1.1/Android.bp b/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.1/Android.bp
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/fmradio/1.1/Android.bp
rename to universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.1/Android.bp
diff --git a/universal7885-common/hardware/interfaces/hardware/fmradio/1.1/IFMRadio.hal b/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.1/IFMRadio.hal
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/fmradio/1.1/IFMRadio.hal
rename to universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.1/IFMRadio.hal
diff --git a/universal7885-common/hardware/interfaces/hardware/fmradio/1.1/types.hal b/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.1/types.hal
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/fmradio/1.1/types.hal
rename to universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.1/types.hal
diff --git a/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/Android.bp b/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/Android.bp
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/fmradio/1.2/Android.bp
rename to universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/Android.bp
diff --git a/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/IFMRadio.hal b/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/IFMRadio.hal
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/fmradio/1.2/IFMRadio.hal
rename to universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/IFMRadio.hal
diff --git a/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/Android.bp b/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/Android.bp
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/Android.bp
rename to universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/Android.bp
diff --git a/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/FMRadio.cpp b/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/FMRadio.cpp
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/FMRadio.cpp
rename to universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/FMRadio.cpp
diff --git a/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/FMRadio.h b/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/FMRadio.h
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/FMRadio.h
rename to universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/FMRadio.h
diff --git a/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/service.cpp b/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/service.cpp
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/service.cpp
rename to universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/service.cpp
diff --git a/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2-service.rc b/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2-service.rc
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2-service.rc
rename to universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2-service.rc
diff --git a/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2.xml b/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2.xml
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2.xml
rename to universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2.xml
diff --git a/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/types.hal b/universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/types.hal
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/fmradio/1.2/types.hal
rename to universal7885-common/bin/hardware/interfaces/hardware/fmradio/1.2/types.hal
diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/Android.bp b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/Android.bp
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/parts/1.0/Android.bp
rename to universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/Android.bp
diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/IBatteryStats.hal b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/IBatteryStats.hal
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/parts/1.0/IBatteryStats.hal
rename to universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/IBatteryStats.hal
diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/IDisplayConfigs.hal b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/IDisplayConfigs.hal
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/parts/1.0/IDisplayConfigs.hal
rename to universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/IDisplayConfigs.hal
diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/IFlashBrightness.hal b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/IFlashBrightness.hal
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/parts/1.0/IFlashBrightness.hal
rename to universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/IFlashBrightness.hal
diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/ISwapOnData.hal b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/ISwapOnData.hal
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/parts/1.0/ISwapOnData.hal
rename to universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/ISwapOnData.hal
diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Android.bp b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Android.bp
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Android.bp
rename to universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Android.bp
diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Battery.cpp b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Battery.cpp
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Battery.cpp
rename to universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Battery.cpp
diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Battery.h b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Battery.h
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Battery.h
rename to universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Battery.h
diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Display.cpp b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Display.cpp
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Display.cpp
rename to universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Display.cpp
diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Display.h b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Display.h
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Display.h
rename to universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Display.h
diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/FlashLight.cpp b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/FlashLight.cpp
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/parts/1.0/default/FlashLight.cpp
rename to universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/FlashLight.cpp
diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/FlashLight.h b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/FlashLight.h
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/parts/1.0/default/FlashLight.h
rename to universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/FlashLight.h
diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Swap.cpp b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Swap.cpp
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Swap.cpp
rename to universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Swap.cpp
diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Swap.h b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Swap.h
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Swap.h
rename to universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/Swap.h
diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/service.cpp b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/service.cpp
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/parts/1.0/default/service.cpp
rename to universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/service.cpp
diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0-service.rc b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0-service.rc
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0-service.rc
rename to universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0-service.rc
diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0.xml b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0.xml
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0.xml
rename to universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0.xml
diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/types.hal b/universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/types.hal
similarity index 100%
rename from universal7885-common/hardware/interfaces/hardware/parts/1.0/types.hal
rename to universal7885-common/bin/hardware/interfaces/hardware/parts/1.0/types.hal
diff --git a/universal7885-common/hardware/samsung/camera/provider/Android.bp b/universal7885-common/bin/hardware/samsung/camera/provider/Android.bp
similarity index 100%
rename from universal7885-common/hardware/samsung/camera/provider/Android.bp
rename to universal7885-common/bin/hardware/samsung/camera/provider/Android.bp
diff --git a/universal7885-common/hardware/samsung/camera/provider/SamsungCameraProvider.cpp b/universal7885-common/bin/hardware/samsung/camera/provider/SamsungCameraProvider.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/camera/provider/SamsungCameraProvider.cpp
rename to universal7885-common/bin/hardware/samsung/camera/provider/SamsungCameraProvider.cpp
diff --git a/universal7885-common/hardware/samsung/camera/provider/SamsungCameraProvider.h b/universal7885-common/bin/hardware/samsung/camera/provider/SamsungCameraProvider.h
similarity index 100%
rename from universal7885-common/hardware/samsung/camera/provider/SamsungCameraProvider.h
rename to universal7885-common/bin/hardware/samsung/camera/provider/SamsungCameraProvider.h
diff --git a/universal7885-common/hardware/samsung/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc b/universal7885-common/bin/hardware/samsung/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc
similarity index 100%
rename from universal7885-common/hardware/samsung/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc
rename to universal7885-common/bin/hardware/samsung/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc
diff --git a/universal7885-common/hardware/samsung/camera/provider/service.cpp b/universal7885-common/bin/hardware/samsung/camera/provider/service.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/camera/provider/service.cpp
rename to universal7885-common/bin/hardware/samsung/camera/provider/service.cpp
diff --git a/universal7885-common/hardware/samsung/fingerprint/Android.bp b/universal7885-common/bin/hardware/samsung/fingerprint/Android.bp
similarity index 100%
rename from universal7885-common/hardware/samsung/fingerprint/Android.bp
rename to universal7885-common/bin/hardware/samsung/fingerprint/Android.bp
diff --git a/universal7885-common/hardware/samsung/fingerprint/BiometricsFingerprint.cpp b/universal7885-common/bin/hardware/samsung/fingerprint/BiometricsFingerprint.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/fingerprint/BiometricsFingerprint.cpp
rename to universal7885-common/bin/hardware/samsung/fingerprint/BiometricsFingerprint.cpp
diff --git a/universal7885-common/hardware/samsung/fingerprint/BiometricsFingerprint.h b/universal7885-common/bin/hardware/samsung/fingerprint/BiometricsFingerprint.h
similarity index 100%
rename from universal7885-common/hardware/samsung/fingerprint/BiometricsFingerprint.h
rename to universal7885-common/bin/hardware/samsung/fingerprint/BiometricsFingerprint.h
diff --git a/universal7885-common/hardware/samsung/fingerprint/VendorConstants.h b/universal7885-common/bin/hardware/samsung/fingerprint/VendorConstants.h
similarity index 100%
rename from universal7885-common/hardware/samsung/fingerprint/VendorConstants.h
rename to universal7885-common/bin/hardware/samsung/fingerprint/VendorConstants.h
diff --git a/universal7885-common/hardware/samsung/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.rc b/universal7885-common/bin/hardware/samsung/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.rc
similarity index 100%
rename from universal7885-common/hardware/samsung/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.rc
rename to universal7885-common/bin/hardware/samsung/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.rc
diff --git a/universal7885-common/hardware/samsung/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.xml b/universal7885-common/bin/hardware/samsung/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.xml
similarity index 100%
rename from universal7885-common/hardware/samsung/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.xml
rename to universal7885-common/bin/hardware/samsung/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.xml
diff --git a/universal7885-common/hardware/samsung/fingerprint/service.cpp b/universal7885-common/bin/hardware/samsung/fingerprint/service.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/fingerprint/service.cpp
rename to universal7885-common/bin/hardware/samsung/fingerprint/service.cpp
diff --git a/universal7885-common/hardware/samsung/keymaster/Android.mk b/universal7885-common/bin/hardware/samsung/keymaster/Android.mk
similarity index 100%
rename from universal7885-common/hardware/samsung/keymaster/Android.mk
rename to universal7885-common/bin/hardware/samsung/keymaster/Android.mk
diff --git a/universal7885-common/hardware/samsung/keymaster/android.hardware.keymaster@4.0-service.samsung.rc b/universal7885-common/bin/hardware/samsung/keymaster/android.hardware.keymaster@4.0-service.samsung.rc
similarity index 100%
rename from universal7885-common/hardware/samsung/keymaster/android.hardware.keymaster@4.0-service.samsung.rc
rename to universal7885-common/bin/hardware/samsung/keymaster/android.hardware.keymaster@4.0-service.samsung.rc
diff --git a/universal7885-common/hardware/samsung/keymaster/service.cpp b/universal7885-common/bin/hardware/samsung/keymaster/service.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/keymaster/service.cpp
rename to universal7885-common/bin/hardware/samsung/keymaster/service.cpp
diff --git a/universal7885-common/hardware/samsung/light/Android.bp b/universal7885-common/bin/hardware/samsung/light/Android.bp
similarity index 100%
rename from universal7885-common/hardware/samsung/light/Android.bp
rename to universal7885-common/bin/hardware/samsung/light/Android.bp
diff --git a/universal7885-common/hardware/samsung/light/Lights.cpp b/universal7885-common/bin/hardware/samsung/light/Lights.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/light/Lights.cpp
rename to universal7885-common/bin/hardware/samsung/light/Lights.cpp
diff --git a/universal7885-common/hardware/samsung/light/Lights.h b/universal7885-common/bin/hardware/samsung/light/Lights.h
similarity index 100%
rename from universal7885-common/hardware/samsung/light/Lights.h
rename to universal7885-common/bin/hardware/samsung/light/Lights.h
diff --git a/universal7885-common/hardware/samsung/light/android.hardware.light-service.samsung.rc b/universal7885-common/bin/hardware/samsung/light/android.hardware.light-service.samsung.rc
similarity index 100%
rename from universal7885-common/hardware/samsung/light/android.hardware.light-service.samsung.rc
rename to universal7885-common/bin/hardware/samsung/light/android.hardware.light-service.samsung.rc
diff --git a/universal7885-common/hardware/samsung/light/android.hardware.light-service.samsung.xml b/universal7885-common/bin/hardware/samsung/light/android.hardware.light-service.samsung.xml
similarity index 100%
rename from universal7885-common/hardware/samsung/light/android.hardware.light-service.samsung.xml
rename to universal7885-common/bin/hardware/samsung/light/android.hardware.light-service.samsung.xml
diff --git a/universal7885-common/hardware/samsung/light/include/samsung_lights.h b/universal7885-common/bin/hardware/samsung/light/include/samsung_lights.h
similarity index 100%
rename from universal7885-common/hardware/samsung/light/include/samsung_lights.h
rename to universal7885-common/bin/hardware/samsung/light/include/samsung_lights.h
diff --git a/universal7885-common/hardware/samsung/light/service.cpp b/universal7885-common/bin/hardware/samsung/light/service.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/light/service.cpp
rename to universal7885-common/bin/hardware/samsung/light/service.cpp
diff --git a/universal7885-common/hardware/samsung/power-libperfmgr/Android.bp b/universal7885-common/bin/hardware/samsung/power-libperfmgr/Android.bp
similarity index 100%
rename from universal7885-common/hardware/samsung/power-libperfmgr/Android.bp
rename to universal7885-common/bin/hardware/samsung/power-libperfmgr/Android.bp
diff --git a/universal7885-common/hardware/samsung/power-libperfmgr/InteractionHandler.cpp b/universal7885-common/bin/hardware/samsung/power-libperfmgr/InteractionHandler.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/power-libperfmgr/InteractionHandler.cpp
rename to universal7885-common/bin/hardware/samsung/power-libperfmgr/InteractionHandler.cpp
diff --git a/universal7885-common/hardware/samsung/power-libperfmgr/InteractionHandler.h b/universal7885-common/bin/hardware/samsung/power-libperfmgr/InteractionHandler.h
similarity index 100%
rename from universal7885-common/hardware/samsung/power-libperfmgr/InteractionHandler.h
rename to universal7885-common/bin/hardware/samsung/power-libperfmgr/InteractionHandler.h
diff --git a/universal7885-common/hardware/samsung/power-libperfmgr/Power.cpp b/universal7885-common/bin/hardware/samsung/power-libperfmgr/Power.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/power-libperfmgr/Power.cpp
rename to universal7885-common/bin/hardware/samsung/power-libperfmgr/Power.cpp
diff --git a/universal7885-common/hardware/samsung/power-libperfmgr/Power.h b/universal7885-common/bin/hardware/samsung/power-libperfmgr/Power.h
similarity index 100%
rename from universal7885-common/hardware/samsung/power-libperfmgr/Power.h
rename to universal7885-common/bin/hardware/samsung/power-libperfmgr/Power.h
diff --git a/universal7885-common/hardware/samsung/power-libperfmgr/PowerExt.cpp b/universal7885-common/bin/hardware/samsung/power-libperfmgr/PowerExt.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/power-libperfmgr/PowerExt.cpp
rename to universal7885-common/bin/hardware/samsung/power-libperfmgr/PowerExt.cpp
diff --git a/universal7885-common/hardware/samsung/power-libperfmgr/PowerExt.h b/universal7885-common/bin/hardware/samsung/power-libperfmgr/PowerExt.h
similarity index 100%
rename from universal7885-common/hardware/samsung/power-libperfmgr/PowerExt.h
rename to universal7885-common/bin/hardware/samsung/power-libperfmgr/PowerExt.h
diff --git a/universal7885-common/hardware/samsung/power-libperfmgr/android.hardware.power-service.samsung-libperfmgr.rc b/universal7885-common/bin/hardware/samsung/power-libperfmgr/android.hardware.power-service.samsung-libperfmgr.rc
similarity index 100%
rename from universal7885-common/hardware/samsung/power-libperfmgr/android.hardware.power-service.samsung-libperfmgr.rc
rename to universal7885-common/bin/hardware/samsung/power-libperfmgr/android.hardware.power-service.samsung-libperfmgr.rc
diff --git a/universal7885-common/hardware/samsung/power-libperfmgr/android.hardware.power-service.samsung.xml b/universal7885-common/bin/hardware/samsung/power-libperfmgr/android.hardware.power-service.samsung.xml
similarity index 100%
rename from universal7885-common/hardware/samsung/power-libperfmgr/android.hardware.power-service.samsung.xml
rename to universal7885-common/bin/hardware/samsung/power-libperfmgr/android.hardware.power-service.samsung.xml
diff --git a/universal7885-common/hardware/samsung/power-libperfmgr/service.cpp b/universal7885-common/bin/hardware/samsung/power-libperfmgr/service.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/power-libperfmgr/service.cpp
rename to universal7885-common/bin/hardware/samsung/power-libperfmgr/service.cpp
diff --git a/universal7885-common/hardware/samsung/secril_config_svc/Android.bp b/universal7885-common/bin/hardware/samsung/secril_config_svc/Android.bp
similarity index 100%
rename from universal7885-common/hardware/samsung/secril_config_svc/Android.bp
rename to universal7885-common/bin/hardware/samsung/secril_config_svc/Android.bp
diff --git a/universal7885-common/hardware/samsung/secril_config_svc/secril_config_svc.cpp b/universal7885-common/bin/hardware/samsung/secril_config_svc/secril_config_svc.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/secril_config_svc/secril_config_svc.cpp
rename to universal7885-common/bin/hardware/samsung/secril_config_svc/secril_config_svc.cpp
diff --git a/universal7885-common/hardware/samsung/sensors/Android.bp b/universal7885-common/bin/hardware/samsung/sensors/Android.bp
similarity index 100%
rename from universal7885-common/hardware/samsung/sensors/Android.bp
rename to universal7885-common/bin/hardware/samsung/sensors/Android.bp
diff --git a/universal7885-common/hardware/samsung/sensors/Sensors.cpp b/universal7885-common/bin/hardware/samsung/sensors/Sensors.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/sensors/Sensors.cpp
rename to universal7885-common/bin/hardware/samsung/sensors/Sensors.cpp
diff --git a/universal7885-common/hardware/samsung/sensors/Sensors.h b/universal7885-common/bin/hardware/samsung/sensors/Sensors.h
similarity index 100%
rename from universal7885-common/hardware/samsung/sensors/Sensors.h
rename to universal7885-common/bin/hardware/samsung/sensors/Sensors.h
diff --git a/universal7885-common/hardware/samsung/usb/typeb/Android.bp b/universal7885-common/bin/hardware/samsung/usb/typeb/Android.bp
similarity index 100%
rename from universal7885-common/hardware/samsung/usb/typeb/Android.bp
rename to universal7885-common/bin/hardware/samsung/usb/typeb/Android.bp
diff --git a/universal7885-common/hardware/samsung/usb/typeb/Usb.cpp b/universal7885-common/bin/hardware/samsung/usb/typeb/Usb.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/usb/typeb/Usb.cpp
rename to universal7885-common/bin/hardware/samsung/usb/typeb/Usb.cpp
diff --git a/universal7885-common/hardware/samsung/usb/typeb/Usb.h b/universal7885-common/bin/hardware/samsung/usb/typeb/Usb.h
similarity index 100%
rename from universal7885-common/hardware/samsung/usb/typeb/Usb.h
rename to universal7885-common/bin/hardware/samsung/usb/typeb/Usb.h
diff --git a/universal7885-common/hardware/samsung/usb/typeb/android.hardware.usb@1.0-service.a10.rc b/universal7885-common/bin/hardware/samsung/usb/typeb/android.hardware.usb@1.0-service.a10.rc
similarity index 100%
rename from universal7885-common/hardware/samsung/usb/typeb/android.hardware.usb@1.0-service.a10.rc
rename to universal7885-common/bin/hardware/samsung/usb/typeb/android.hardware.usb@1.0-service.a10.rc
diff --git a/universal7885-common/hardware/samsung/usb/typeb/android.hardware.usb@1.0-service.a10.xml b/universal7885-common/bin/hardware/samsung/usb/typeb/android.hardware.usb@1.0-service.a10.xml
similarity index 100%
rename from universal7885-common/hardware/samsung/usb/typeb/android.hardware.usb@1.0-service.a10.xml
rename to universal7885-common/bin/hardware/samsung/usb/typeb/android.hardware.usb@1.0-service.a10.xml
diff --git a/universal7885-common/hardware/samsung/usb/typeb/service.cpp b/universal7885-common/bin/hardware/samsung/usb/typeb/service.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/usb/typeb/service.cpp
rename to universal7885-common/bin/hardware/samsung/usb/typeb/service.cpp
diff --git a/universal7885-common/hardware/samsung/usb/typec/Android.bp b/universal7885-common/bin/hardware/samsung/usb/typec/Android.bp
similarity index 100%
rename from universal7885-common/hardware/samsung/usb/typec/Android.bp
rename to universal7885-common/bin/hardware/samsung/usb/typec/Android.bp
diff --git a/universal7885-common/hardware/samsung/usb/typec/Usb.cpp b/universal7885-common/bin/hardware/samsung/usb/typec/Usb.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/usb/typec/Usb.cpp
rename to universal7885-common/bin/hardware/samsung/usb/typec/Usb.cpp
diff --git a/universal7885-common/hardware/samsung/usb/typec/Usb.h b/universal7885-common/bin/hardware/samsung/usb/typec/Usb.h
similarity index 100%
rename from universal7885-common/hardware/samsung/usb/typec/Usb.h
rename to universal7885-common/bin/hardware/samsung/usb/typec/Usb.h
diff --git a/universal7885-common/hardware/samsung/usb/typec/android.hardware.usb@1.3-service.samsung.rc b/universal7885-common/bin/hardware/samsung/usb/typec/android.hardware.usb@1.3-service.samsung.rc
similarity index 100%
rename from universal7885-common/hardware/samsung/usb/typec/android.hardware.usb@1.3-service.samsung.rc
rename to universal7885-common/bin/hardware/samsung/usb/typec/android.hardware.usb@1.3-service.samsung.rc
diff --git a/universal7885-common/hardware/samsung/usb/typec/android.hardware.usb@1.3-service.samsung.xml b/universal7885-common/bin/hardware/samsung/usb/typec/android.hardware.usb@1.3-service.samsung.xml
similarity index 100%
rename from universal7885-common/hardware/samsung/usb/typec/android.hardware.usb@1.3-service.samsung.xml
rename to universal7885-common/bin/hardware/samsung/usb/typec/android.hardware.usb@1.3-service.samsung.xml
diff --git a/universal7885-common/hardware/samsung/usb/typec/service.cpp b/universal7885-common/bin/hardware/samsung/usb/typec/service.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/usb/typec/service.cpp
rename to universal7885-common/bin/hardware/samsung/usb/typec/service.cpp
diff --git a/universal7885-common/hardware/samsung/vibrator/Android.bp b/universal7885-common/bin/hardware/samsung/vibrator/Android.bp
similarity index 100%
rename from universal7885-common/hardware/samsung/vibrator/Android.bp
rename to universal7885-common/bin/hardware/samsung/vibrator/Android.bp
diff --git a/universal7885-common/hardware/samsung/vibrator/Vibrator.cpp b/universal7885-common/bin/hardware/samsung/vibrator/Vibrator.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/vibrator/Vibrator.cpp
rename to universal7885-common/bin/hardware/samsung/vibrator/Vibrator.cpp
diff --git a/universal7885-common/hardware/samsung/vibrator/Vibrator.h b/universal7885-common/bin/hardware/samsung/vibrator/Vibrator.h
similarity index 100%
rename from universal7885-common/hardware/samsung/vibrator/Vibrator.h
rename to universal7885-common/bin/hardware/samsung/vibrator/Vibrator.h
diff --git a/universal7885-common/hardware/samsung/vibrator/android.hardware.vibrator-service.samsung.rc b/universal7885-common/bin/hardware/samsung/vibrator/android.hardware.vibrator-service.samsung.rc
similarity index 100%
rename from universal7885-common/hardware/samsung/vibrator/android.hardware.vibrator-service.samsung.rc
rename to universal7885-common/bin/hardware/samsung/vibrator/android.hardware.vibrator-service.samsung.rc
diff --git a/universal7885-common/hardware/samsung/vibrator/android.hardware.vibrator-service.samsung.xml b/universal7885-common/bin/hardware/samsung/vibrator/android.hardware.vibrator-service.samsung.xml
similarity index 100%
rename from universal7885-common/hardware/samsung/vibrator/android.hardware.vibrator-service.samsung.xml
rename to universal7885-common/bin/hardware/samsung/vibrator/android.hardware.vibrator-service.samsung.xml
diff --git a/universal7885-common/hardware/samsung/vibrator/service.cpp b/universal7885-common/bin/hardware/samsung/vibrator/service.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/vibrator/service.cpp
rename to universal7885-common/bin/hardware/samsung/vibrator/service.cpp
diff --git a/universal7885-common/init/Android.bp b/universal7885-common/bin/init/Android.bp
similarity index 100%
rename from universal7885-common/init/Android.bp
rename to universal7885-common/bin/init/Android.bp
diff --git a/universal7885-common/init/init_universal7885.cpp b/universal7885-common/bin/init/init_universal7885.cpp
similarity index 100%
rename from universal7885-common/init/init_universal7885.cpp
rename to universal7885-common/bin/init/init_universal7885.cpp
diff --git a/universal7885-common/libshims/camera/Android.bp b/universal7885-common/bin/libshims/camera/Android.bp
similarity index 100%
rename from universal7885-common/libshims/camera/Android.bp
rename to universal7885-common/bin/libshims/camera/Android.bp
diff --git a/universal7885-common/libshims/camera/CamDevice_3_2.h b/universal7885-common/bin/libshims/camera/CamDevice_3_2.h
similarity index 100%
rename from universal7885-common/libshims/camera/CamDevice_3_2.h
rename to universal7885-common/bin/libshims/camera/CamDevice_3_2.h
diff --git a/universal7885-common/libshims/camera/CorrectCameraID.cpp b/universal7885-common/bin/libshims/camera/CorrectCameraID.cpp
similarity index 100%
rename from universal7885-common/libshims/camera/CorrectCameraID.cpp
rename to universal7885-common/bin/libshims/camera/CorrectCameraID.cpp
diff --git a/universal7885-common/libshims/fakelogprint/Android.bp b/universal7885-common/bin/libshims/fakelogprint/Android.bp
similarity index 100%
rename from universal7885-common/libshims/fakelogprint/Android.bp
rename to universal7885-common/bin/libshims/fakelogprint/Android.bp
diff --git a/universal7885-common/libshims/fakelogprint/fakelogprint.cpp b/universal7885-common/bin/libshims/fakelogprint/fakelogprint.cpp
similarity index 100%
rename from universal7885-common/libshims/fakelogprint/fakelogprint.cpp
rename to universal7885-common/bin/libshims/fakelogprint/fakelogprint.cpp
diff --git a/universal7885-common/libshims/sensor/ASensorManager.cpp b/universal7885-common/bin/libshims/sensor/ASensorManager.cpp
similarity index 100%
rename from universal7885-common/libshims/sensor/ASensorManager.cpp
rename to universal7885-common/bin/libshims/sensor/ASensorManager.cpp
diff --git a/universal7885-common/libshims/sensor/Android.bp b/universal7885-common/bin/libshims/sensor/Android.bp
similarity index 100%
rename from universal7885-common/libshims/sensor/Android.bp
rename to universal7885-common/bin/libshims/sensor/Android.bp
diff --git a/universal7885-common/keyhandler/Android.bp b/universal7885-common/keyhandler/Android.bp
deleted file mode 100644
index a3adb5e..0000000
--- a/universal7885-common/keyhandler/Android.bp
+++ /dev/null
@@ -1,7 +0,0 @@
-java_sdk_library {
-    name: "keyhandler",
-    srcs: [
-        "src/com/eurekateam/keyhandler/KeyHandler.java",
-    ],
-    unsafe_ignore_missing_latest_api: true,
-}
diff --git a/universal7885-common/keyhandler/api/current.txt b/universal7885-common/keyhandler/api/current.txt
deleted file mode 100644
index ee40932..0000000
--- a/universal7885-common/keyhandler/api/current.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.eurekateam.keyhandler {
- public class KeyHandler {
-    ctor public KeyHandler (android.content.Context);
-    method public android.view.KeyEvent handleKeyEvent();
-  }
-}
\ No newline at end of file
diff --git a/universal7885-common/keyhandler/api/removed.txt b/universal7885-common/keyhandler/api/removed.txt
deleted file mode 100644
index d802177..0000000
--- a/universal7885-common/keyhandler/api/removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/universal7885-common/keyhandler/api/system-current.txt b/universal7885-common/keyhandler/api/system-current.txt
deleted file mode 100644
index d802177..0000000
--- a/universal7885-common/keyhandler/api/system-current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/universal7885-common/keyhandler/api/system-removed.txt b/universal7885-common/keyhandler/api/system-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/universal7885-common/keyhandler/api/system-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/universal7885-common/keyhandler/api/test-current.txt b/universal7885-common/keyhandler/api/test-current.txt
deleted file mode 100644
index d802177..0000000
--- a/universal7885-common/keyhandler/api/test-current.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/universal7885-common/keyhandler/api/test-removed.txt b/universal7885-common/keyhandler/api/test-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/universal7885-common/keyhandler/api/test-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/universal7885-common/keyhandler/src/com/eurekateam/keyhandler/KeyHandler.java b/universal7885-common/keyhandler/src/com/eurekateam/keyhandler/KeyHandler.java
deleted file mode 100644
index 9f5cc4b..0000000
--- a/universal7885-common/keyhandler/src/com/eurekateam/keyhandler/KeyHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2021 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package com.eurekateam.keyhandler;
-
-import android.content.Context;
-import android.util.Log;
-import android.view.KeyEvent;
-
-import com.android.internal.os.DeviceKeyHandler;
-
-public class KeyHandler implements DeviceKeyHandler {
-    private static final String TAG = "KeyHandler";
-//  private static final KEYCODE_SIDE_FP = -1;
-    public KeyHandler(Context context) {
-        Log.i(TAG, "KeyHandler constructor called");
-    }
-
-    public KeyEvent handleKeyEvent(KeyEvent event) {
-        int scanCode = event.getScanCode();
-        Log.i(TAG, "handleKeyEvent=" + scanCode);
-        /*
-        switch (scanCode) {
-            case KEYCODE_SIDE_FP:
-                return null;
-            default:
-                return event;
-        }
-        */
-        return event;
-    }
-}
diff --git a/universal7885-common/overlay-derp/packages/apps/Settings/res/values/derp_strings.xml b/universal7885-common/overlay-derp/packages/apps/Settings/res/values/derp_strings.xml
deleted file mode 100644
index 2739d17..0000000
--- a/universal7885-common/overlay-derp/packages/apps/Settings/res/values/derp_strings.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 DerpFest
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-	<string name="maintainer_name">Soo Hwan Na (Royna)</string>
-</resources>
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 3d782c6..2b3756e 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -184,10 +184,6 @@ PRODUCT_COPY_FILES += \
 
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
-TARGET_ROM := $(shell cat $(LOCAL_PATH)/vendor_name)
-ifeq ($(TARGET_ROM), derp)
-DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-derp
-endif
 
 # Permissions
 PRODUCT_COPY_FILES += \