diff --git a/universal7885-common/interfaces/Android.bp b/universal7885-common/hardware/interfaces/Android.bp
similarity index 100%
rename from universal7885-common/interfaces/Android.bp
rename to universal7885-common/hardware/interfaces/Android.bp
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.0/Android.bp b/universal7885-common/hardware/interfaces/hardware/fmradio/1.0/Android.bp
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.0/Android.bp
rename to universal7885-common/hardware/interfaces/hardware/fmradio/1.0/Android.bp
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.0/IFMRadio.hal b/universal7885-common/hardware/interfaces/hardware/fmradio/1.0/IFMRadio.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.0/IFMRadio.hal
rename to universal7885-common/hardware/interfaces/hardware/fmradio/1.0/IFMRadio.hal
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.0/types.hal b/universal7885-common/hardware/interfaces/hardware/fmradio/1.0/types.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.0/types.hal
rename to universal7885-common/hardware/interfaces/hardware/fmradio/1.0/types.hal
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.1/Android.bp b/universal7885-common/hardware/interfaces/hardware/fmradio/1.1/Android.bp
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.1/Android.bp
rename to universal7885-common/hardware/interfaces/hardware/fmradio/1.1/Android.bp
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.1/IFMRadio.hal b/universal7885-common/hardware/interfaces/hardware/fmradio/1.1/IFMRadio.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.1/IFMRadio.hal
rename to universal7885-common/hardware/interfaces/hardware/fmradio/1.1/IFMRadio.hal
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.1/types.hal b/universal7885-common/hardware/interfaces/hardware/fmradio/1.1/types.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.1/types.hal
rename to universal7885-common/hardware/interfaces/hardware/fmradio/1.1/types.hal
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.2/Android.bp b/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/Android.bp
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.2/Android.bp
rename to universal7885-common/hardware/interfaces/hardware/fmradio/1.2/Android.bp
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.2/IFMRadio.hal b/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/IFMRadio.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.2/IFMRadio.hal
rename to universal7885-common/hardware/interfaces/hardware/fmradio/1.2/IFMRadio.hal
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.2/default/Android.bp b/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/Android.bp
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.2/default/Android.bp
rename to universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/Android.bp
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.2/default/FMRadio.cpp b/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/FMRadio.cpp
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.2/default/FMRadio.cpp
rename to universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/FMRadio.cpp
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.2/default/FMRadio.h b/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/FMRadio.h
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.2/default/FMRadio.h
rename to universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/FMRadio.h
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.2/default/service.cpp b/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/service.cpp
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.2/default/service.cpp
rename to universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/service.cpp
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2-service.rc b/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2-service.rc
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2-service.rc
rename to universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2-service.rc
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2.xml b/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2.xml
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2.xml
rename to universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2.xml
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.2/types.hal b/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/types.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.2/types.hal
rename to universal7885-common/hardware/interfaces/hardware/fmradio/1.2/types.hal
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/Android.bp b/universal7885-common/hardware/interfaces/hardware/parts/1.0/Android.bp
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/Android.bp
rename to universal7885-common/hardware/interfaces/hardware/parts/1.0/Android.bp
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/IBattery.hal b/universal7885-common/hardware/interfaces/hardware/parts/1.0/IBattery.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/IBattery.hal
rename to universal7885-common/hardware/interfaces/hardware/parts/1.0/IBattery.hal
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/IFlashLight.hal b/universal7885-common/hardware/interfaces/hardware/parts/1.0/IFlashLight.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/IFlashLight.hal
rename to universal7885-common/hardware/interfaces/hardware/parts/1.0/IFlashLight.hal
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/IGpu.hal b/universal7885-common/hardware/interfaces/hardware/parts/1.0/IGpu.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/IGpu.hal
rename to universal7885-common/hardware/interfaces/hardware/parts/1.0/IGpu.hal
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/ISELinux.hal b/universal7885-common/hardware/interfaces/hardware/parts/1.0/ISELinux.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/ISELinux.hal
rename to universal7885-common/hardware/interfaces/hardware/parts/1.0/ISELinux.hal
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/Android.bp b/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Android.bp
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/default/Android.bp
rename to universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Android.bp
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/Battery.cpp b/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Battery.cpp
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/default/Battery.cpp
rename to universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Battery.cpp
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/Battery.h b/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Battery.h
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/default/Battery.h
rename to universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Battery.h
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/FlashLight.cpp b/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/FlashLight.cpp
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/default/FlashLight.cpp
rename to universal7885-common/hardware/interfaces/hardware/parts/1.0/default/FlashLight.cpp
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/FlashLight.h b/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/FlashLight.h
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/default/FlashLight.h
rename to universal7885-common/hardware/interfaces/hardware/parts/1.0/default/FlashLight.h
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/Gpu.cpp b/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Gpu.cpp
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/default/Gpu.cpp
rename to universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Gpu.cpp
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/Gpu.h b/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Gpu.h
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/default/Gpu.h
rename to universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Gpu.h
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/SELinux.cpp b/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/SELinux.cpp
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/default/SELinux.cpp
rename to universal7885-common/hardware/interfaces/hardware/parts/1.0/default/SELinux.cpp
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/SELinux.h b/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/SELinux.h
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/default/SELinux.h
rename to universal7885-common/hardware/interfaces/hardware/parts/1.0/default/SELinux.h
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/service.cpp b/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/service.cpp
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/default/service.cpp
rename to universal7885-common/hardware/interfaces/hardware/parts/1.0/default/service.cpp
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0-service.rc b/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0-service.rc
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0-service.rc
rename to universal7885-common/hardware/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0-service.rc
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0.xml b/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0.xml
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0.xml
rename to universal7885-common/hardware/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0.xml
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/types.hal b/universal7885-common/hardware/interfaces/hardware/parts/1.0/types.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/types.hal
rename to universal7885-common/hardware/interfaces/hardware/parts/1.0/types.hal
diff --git a/universal7885-common/aidl/light/Android.bp b/universal7885-common/hardware/samsung/aidl/light/Android.bp
similarity index 100%
rename from universal7885-common/aidl/light/Android.bp
rename to universal7885-common/hardware/samsung/aidl/light/Android.bp
diff --git a/universal7885-common/aidl/light/Lights.cpp b/universal7885-common/hardware/samsung/aidl/light/Lights.cpp
similarity index 100%
rename from universal7885-common/aidl/light/Lights.cpp
rename to universal7885-common/hardware/samsung/aidl/light/Lights.cpp
diff --git a/universal7885-common/aidl/light/Lights.h b/universal7885-common/hardware/samsung/aidl/light/Lights.h
similarity index 100%
rename from universal7885-common/aidl/light/Lights.h
rename to universal7885-common/hardware/samsung/aidl/light/Lights.h
diff --git a/universal7885-common/aidl/light/android.hardware.light-service.samsung.rc b/universal7885-common/hardware/samsung/aidl/light/android.hardware.light-service.samsung.rc
similarity index 100%
rename from universal7885-common/aidl/light/android.hardware.light-service.samsung.rc
rename to universal7885-common/hardware/samsung/aidl/light/android.hardware.light-service.samsung.rc
diff --git a/universal7885-common/aidl/light/android.hardware.light-service.samsung.xml b/universal7885-common/hardware/samsung/aidl/light/android.hardware.light-service.samsung.xml
similarity index 100%
rename from universal7885-common/aidl/light/android.hardware.light-service.samsung.xml
rename to universal7885-common/hardware/samsung/aidl/light/android.hardware.light-service.samsung.xml
diff --git a/universal7885-common/aidl/light/include/samsung_lights.h b/universal7885-common/hardware/samsung/aidl/light/include/samsung_lights.h
similarity index 100%
rename from universal7885-common/aidl/light/include/samsung_lights.h
rename to universal7885-common/hardware/samsung/aidl/light/include/samsung_lights.h
diff --git a/universal7885-common/aidl/light/service.cpp b/universal7885-common/hardware/samsung/aidl/light/service.cpp
similarity index 100%
rename from universal7885-common/aidl/light/service.cpp
rename to universal7885-common/hardware/samsung/aidl/light/service.cpp
diff --git a/universal7885-common/aidl/power-libperfmgr/Android.bp b/universal7885-common/hardware/samsung/aidl/power-libperfmgr/Android.bp
similarity index 100%
rename from universal7885-common/aidl/power-libperfmgr/Android.bp
rename to universal7885-common/hardware/samsung/aidl/power-libperfmgr/Android.bp
diff --git a/universal7885-common/aidl/power-libperfmgr/InteractionHandler.cpp b/universal7885-common/hardware/samsung/aidl/power-libperfmgr/InteractionHandler.cpp
similarity index 100%
rename from universal7885-common/aidl/power-libperfmgr/InteractionHandler.cpp
rename to universal7885-common/hardware/samsung/aidl/power-libperfmgr/InteractionHandler.cpp
diff --git a/universal7885-common/aidl/power-libperfmgr/InteractionHandler.h b/universal7885-common/hardware/samsung/aidl/power-libperfmgr/InteractionHandler.h
similarity index 100%
rename from universal7885-common/aidl/power-libperfmgr/InteractionHandler.h
rename to universal7885-common/hardware/samsung/aidl/power-libperfmgr/InteractionHandler.h
diff --git a/universal7885-common/aidl/power-libperfmgr/Power.cpp b/universal7885-common/hardware/samsung/aidl/power-libperfmgr/Power.cpp
similarity index 100%
rename from universal7885-common/aidl/power-libperfmgr/Power.cpp
rename to universal7885-common/hardware/samsung/aidl/power-libperfmgr/Power.cpp
diff --git a/universal7885-common/aidl/power-libperfmgr/Power.h b/universal7885-common/hardware/samsung/aidl/power-libperfmgr/Power.h
similarity index 100%
rename from universal7885-common/aidl/power-libperfmgr/Power.h
rename to universal7885-common/hardware/samsung/aidl/power-libperfmgr/Power.h
diff --git a/universal7885-common/aidl/power-libperfmgr/PowerExt.cpp b/universal7885-common/hardware/samsung/aidl/power-libperfmgr/PowerExt.cpp
similarity index 100%
rename from universal7885-common/aidl/power-libperfmgr/PowerExt.cpp
rename to universal7885-common/hardware/samsung/aidl/power-libperfmgr/PowerExt.cpp
diff --git a/universal7885-common/aidl/power-libperfmgr/PowerExt.h b/universal7885-common/hardware/samsung/aidl/power-libperfmgr/PowerExt.h
similarity index 100%
rename from universal7885-common/aidl/power-libperfmgr/PowerExt.h
rename to universal7885-common/hardware/samsung/aidl/power-libperfmgr/PowerExt.h
diff --git a/universal7885-common/aidl/power-libperfmgr/android.hardware.power-service.samsung-libperfmgr.rc b/universal7885-common/hardware/samsung/aidl/power-libperfmgr/android.hardware.power-service.samsung-libperfmgr.rc
similarity index 100%
rename from universal7885-common/aidl/power-libperfmgr/android.hardware.power-service.samsung-libperfmgr.rc
rename to universal7885-common/hardware/samsung/aidl/power-libperfmgr/android.hardware.power-service.samsung-libperfmgr.rc
diff --git a/universal7885-common/aidl/power-libperfmgr/android.hardware.power-service.samsung.xml b/universal7885-common/hardware/samsung/aidl/power-libperfmgr/android.hardware.power-service.samsung.xml
similarity index 100%
rename from universal7885-common/aidl/power-libperfmgr/android.hardware.power-service.samsung.xml
rename to universal7885-common/hardware/samsung/aidl/power-libperfmgr/android.hardware.power-service.samsung.xml
diff --git a/universal7885-common/aidl/power-libperfmgr/service.cpp b/universal7885-common/hardware/samsung/aidl/power-libperfmgr/service.cpp
similarity index 100%
rename from universal7885-common/aidl/power-libperfmgr/service.cpp
rename to universal7885-common/hardware/samsung/aidl/power-libperfmgr/service.cpp
diff --git a/universal7885-common/aidl/vibrator/Android.bp b/universal7885-common/hardware/samsung/aidl/vibrator/Android.bp
similarity index 100%
rename from universal7885-common/aidl/vibrator/Android.bp
rename to universal7885-common/hardware/samsung/aidl/vibrator/Android.bp
diff --git a/universal7885-common/aidl/vibrator/Vibrator.cpp b/universal7885-common/hardware/samsung/aidl/vibrator/Vibrator.cpp
similarity index 100%
rename from universal7885-common/aidl/vibrator/Vibrator.cpp
rename to universal7885-common/hardware/samsung/aidl/vibrator/Vibrator.cpp
diff --git a/universal7885-common/aidl/vibrator/Vibrator.h b/universal7885-common/hardware/samsung/aidl/vibrator/Vibrator.h
similarity index 100%
rename from universal7885-common/aidl/vibrator/Vibrator.h
rename to universal7885-common/hardware/samsung/aidl/vibrator/Vibrator.h
diff --git a/universal7885-common/aidl/vibrator/android.hardware.vibrator-service.samsung.rc b/universal7885-common/hardware/samsung/aidl/vibrator/android.hardware.vibrator-service.samsung.rc
similarity index 100%
rename from universal7885-common/aidl/vibrator/android.hardware.vibrator-service.samsung.rc
rename to universal7885-common/hardware/samsung/aidl/vibrator/android.hardware.vibrator-service.samsung.rc
diff --git a/universal7885-common/aidl/vibrator/android.hardware.vibrator-service.samsung.xml b/universal7885-common/hardware/samsung/aidl/vibrator/android.hardware.vibrator-service.samsung.xml
similarity index 100%
rename from universal7885-common/aidl/vibrator/android.hardware.vibrator-service.samsung.xml
rename to universal7885-common/hardware/samsung/aidl/vibrator/android.hardware.vibrator-service.samsung.xml
diff --git a/universal7885-common/aidl/vibrator/service.cpp b/universal7885-common/hardware/samsung/aidl/vibrator/service.cpp
similarity index 100%
rename from universal7885-common/aidl/vibrator/service.cpp
rename to universal7885-common/hardware/samsung/aidl/vibrator/service.cpp
diff --git a/universal7885-common/hidl/Android.mk b/universal7885-common/hardware/samsung/hidl/Android.mk
similarity index 100%
rename from universal7885-common/hidl/Android.mk
rename to universal7885-common/hardware/samsung/hidl/Android.mk
diff --git a/universal7885-common/hidl/camera/provider/Android.bp b/universal7885-common/hardware/samsung/hidl/camera/provider/Android.bp
similarity index 100%
rename from universal7885-common/hidl/camera/provider/Android.bp
rename to universal7885-common/hardware/samsung/hidl/camera/provider/Android.bp
diff --git a/universal7885-common/hidl/camera/provider/SamsungCameraProvider.cpp b/universal7885-common/hardware/samsung/hidl/camera/provider/SamsungCameraProvider.cpp
similarity index 100%
rename from universal7885-common/hidl/camera/provider/SamsungCameraProvider.cpp
rename to universal7885-common/hardware/samsung/hidl/camera/provider/SamsungCameraProvider.cpp
diff --git a/universal7885-common/hidl/camera/provider/SamsungCameraProvider.h b/universal7885-common/hardware/samsung/hidl/camera/provider/SamsungCameraProvider.h
similarity index 100%
rename from universal7885-common/hidl/camera/provider/SamsungCameraProvider.h
rename to universal7885-common/hardware/samsung/hidl/camera/provider/SamsungCameraProvider.h
diff --git a/universal7885-common/hidl/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc b/universal7885-common/hardware/samsung/hidl/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc
similarity index 100%
rename from universal7885-common/hidl/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc
rename to universal7885-common/hardware/samsung/hidl/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc
diff --git a/universal7885-common/hidl/camera/provider/service.cpp b/universal7885-common/hardware/samsung/hidl/camera/provider/service.cpp
similarity index 100%
rename from universal7885-common/hidl/camera/provider/service.cpp
rename to universal7885-common/hardware/samsung/hidl/camera/provider/service.cpp
diff --git a/universal7885-common/hidl/fingerprint/Android.bp b/universal7885-common/hardware/samsung/hidl/fingerprint/Android.bp
similarity index 100%
rename from universal7885-common/hidl/fingerprint/Android.bp
rename to universal7885-common/hardware/samsung/hidl/fingerprint/Android.bp
diff --git a/universal7885-common/hidl/fingerprint/BiometricsFingerprint.cpp b/universal7885-common/hardware/samsung/hidl/fingerprint/BiometricsFingerprint.cpp
similarity index 100%
rename from universal7885-common/hidl/fingerprint/BiometricsFingerprint.cpp
rename to universal7885-common/hardware/samsung/hidl/fingerprint/BiometricsFingerprint.cpp
diff --git a/universal7885-common/hidl/fingerprint/BiometricsFingerprint.h b/universal7885-common/hardware/samsung/hidl/fingerprint/BiometricsFingerprint.h
similarity index 100%
rename from universal7885-common/hidl/fingerprint/BiometricsFingerprint.h
rename to universal7885-common/hardware/samsung/hidl/fingerprint/BiometricsFingerprint.h
diff --git a/universal7885-common/hidl/fingerprint/VendorConstants.h b/universal7885-common/hardware/samsung/hidl/fingerprint/VendorConstants.h
similarity index 100%
rename from universal7885-common/hidl/fingerprint/VendorConstants.h
rename to universal7885-common/hardware/samsung/hidl/fingerprint/VendorConstants.h
diff --git a/universal7885-common/hidl/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.rc b/universal7885-common/hardware/samsung/hidl/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.rc
similarity index 100%
rename from universal7885-common/hidl/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.rc
rename to universal7885-common/hardware/samsung/hidl/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.rc
diff --git a/universal7885-common/hidl/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.xml b/universal7885-common/hardware/samsung/hidl/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.xml
similarity index 100%
rename from universal7885-common/hidl/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.xml
rename to universal7885-common/hardware/samsung/hidl/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.xml
diff --git a/universal7885-common/hidl/fingerprint/service.cpp b/universal7885-common/hardware/samsung/hidl/fingerprint/service.cpp
similarity index 100%
rename from universal7885-common/hidl/fingerprint/service.cpp
rename to universal7885-common/hardware/samsung/hidl/fingerprint/service.cpp
diff --git a/universal7885-common/hidl/keymaster/Android.mk b/universal7885-common/hardware/samsung/hidl/keymaster/Android.mk
similarity index 100%
rename from universal7885-common/hidl/keymaster/Android.mk
rename to universal7885-common/hardware/samsung/hidl/keymaster/Android.mk
diff --git a/universal7885-common/hidl/keymaster/android.hardware.keymaster@4.0-service.samsung.rc b/universal7885-common/hardware/samsung/hidl/keymaster/android.hardware.keymaster@4.0-service.samsung.rc
similarity index 100%
rename from universal7885-common/hidl/keymaster/android.hardware.keymaster@4.0-service.samsung.rc
rename to universal7885-common/hardware/samsung/hidl/keymaster/android.hardware.keymaster@4.0-service.samsung.rc
diff --git a/universal7885-common/hidl/keymaster/service.cpp b/universal7885-common/hardware/samsung/hidl/keymaster/service.cpp
similarity index 100%
rename from universal7885-common/hidl/keymaster/service.cpp
rename to universal7885-common/hardware/samsung/hidl/keymaster/service.cpp
diff --git a/universal7885-common/hidl/sensors/Android.bp b/universal7885-common/hardware/samsung/hidl/sensors/Android.bp
similarity index 100%
rename from universal7885-common/hidl/sensors/Android.bp
rename to universal7885-common/hardware/samsung/hidl/sensors/Android.bp
diff --git a/universal7885-common/hidl/sensors/Sensors.cpp b/universal7885-common/hardware/samsung/hidl/sensors/Sensors.cpp
similarity index 100%
rename from universal7885-common/hidl/sensors/Sensors.cpp
rename to universal7885-common/hardware/samsung/hidl/sensors/Sensors.cpp
diff --git a/universal7885-common/hidl/sensors/Sensors.h b/universal7885-common/hardware/samsung/hidl/sensors/Sensors.h
similarity index 100%
rename from universal7885-common/hidl/sensors/Sensors.h
rename to universal7885-common/hardware/samsung/hidl/sensors/Sensors.h
diff --git a/universal7885-common/secril_config_svc/Android.bp b/universal7885-common/hardware/samsung/secril_config_svc/Android.bp
similarity index 100%
rename from universal7885-common/secril_config_svc/Android.bp
rename to universal7885-common/hardware/samsung/secril_config_svc/Android.bp
diff --git a/universal7885-common/secril_config_svc/secril_config_svc.cpp b/universal7885-common/hardware/samsung/secril_config_svc/secril_config_svc.cpp
similarity index 100%
rename from universal7885-common/secril_config_svc/secril_config_svc.cpp
rename to universal7885-common/hardware/samsung/secril_config_svc/secril_config_svc.cpp
diff --git a/universal7885-common/usb/typeb/Android.bp b/universal7885-common/hardware/samsung/usb/typeb/Android.bp
similarity index 100%
rename from universal7885-common/usb/typeb/Android.bp
rename to universal7885-common/hardware/samsung/usb/typeb/Android.bp
diff --git a/universal7885-common/usb/typeb/Usb.cpp b/universal7885-common/hardware/samsung/usb/typeb/Usb.cpp
similarity index 100%
rename from universal7885-common/usb/typeb/Usb.cpp
rename to universal7885-common/hardware/samsung/usb/typeb/Usb.cpp
diff --git a/universal7885-common/usb/typeb/Usb.h b/universal7885-common/hardware/samsung/usb/typeb/Usb.h
similarity index 100%
rename from universal7885-common/usb/typeb/Usb.h
rename to universal7885-common/hardware/samsung/usb/typeb/Usb.h
diff --git a/universal7885-common/usb/typeb/android.hardware.usb@1.0-service.a10.rc b/universal7885-common/hardware/samsung/usb/typeb/android.hardware.usb@1.0-service.a10.rc
similarity index 100%
rename from universal7885-common/usb/typeb/android.hardware.usb@1.0-service.a10.rc
rename to universal7885-common/hardware/samsung/usb/typeb/android.hardware.usb@1.0-service.a10.rc
diff --git a/universal7885-common/usb/typeb/android.hardware.usb@1.0-service.a10.xml b/universal7885-common/hardware/samsung/usb/typeb/android.hardware.usb@1.0-service.a10.xml
similarity index 100%
rename from universal7885-common/usb/typeb/android.hardware.usb@1.0-service.a10.xml
rename to universal7885-common/hardware/samsung/usb/typeb/android.hardware.usb@1.0-service.a10.xml
diff --git a/universal7885-common/usb/typeb/service.cpp b/universal7885-common/hardware/samsung/usb/typeb/service.cpp
similarity index 100%
rename from universal7885-common/usb/typeb/service.cpp
rename to universal7885-common/hardware/samsung/usb/typeb/service.cpp
diff --git a/universal7885-common/usb/typec/Android.bp b/universal7885-common/hardware/samsung/usb/typec/Android.bp
similarity index 100%
rename from universal7885-common/usb/typec/Android.bp
rename to universal7885-common/hardware/samsung/usb/typec/Android.bp
diff --git a/universal7885-common/usb/typec/Usb.cpp b/universal7885-common/hardware/samsung/usb/typec/Usb.cpp
similarity index 100%
rename from universal7885-common/usb/typec/Usb.cpp
rename to universal7885-common/hardware/samsung/usb/typec/Usb.cpp
diff --git a/universal7885-common/usb/typec/Usb.h b/universal7885-common/hardware/samsung/usb/typec/Usb.h
similarity index 100%
rename from universal7885-common/usb/typec/Usb.h
rename to universal7885-common/hardware/samsung/usb/typec/Usb.h
diff --git a/universal7885-common/usb/typec/android.hardware.usb@1.1-service.exynos7885.rc b/universal7885-common/hardware/samsung/usb/typec/android.hardware.usb@1.1-service.exynos7885.rc
similarity index 100%
rename from universal7885-common/usb/typec/android.hardware.usb@1.1-service.exynos7885.rc
rename to universal7885-common/hardware/samsung/usb/typec/android.hardware.usb@1.1-service.exynos7885.rc
diff --git a/universal7885-common/usb/typec/service.cpp b/universal7885-common/hardware/samsung/usb/typec/service.cpp
similarity index 100%
rename from universal7885-common/usb/typec/service.cpp
rename to universal7885-common/hardware/samsung/usb/typec/service.cpp