diff --git a/universal7885-common/hardware/samsung/hidl/camera/provider/Android.bp b/universal7885-common/hardware/samsung/camera/provider/Android.bp
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/camera/provider/Android.bp
rename to universal7885-common/hardware/samsung/camera/provider/Android.bp
diff --git a/universal7885-common/hardware/samsung/hidl/camera/provider/SamsungCameraProvider.cpp b/universal7885-common/hardware/samsung/camera/provider/SamsungCameraProvider.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/camera/provider/SamsungCameraProvider.cpp
rename to universal7885-common/hardware/samsung/camera/provider/SamsungCameraProvider.cpp
diff --git a/universal7885-common/hardware/samsung/hidl/camera/provider/SamsungCameraProvider.h b/universal7885-common/hardware/samsung/camera/provider/SamsungCameraProvider.h
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/camera/provider/SamsungCameraProvider.h
rename to universal7885-common/hardware/samsung/camera/provider/SamsungCameraProvider.h
diff --git a/universal7885-common/hardware/samsung/hidl/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc b/universal7885-common/hardware/samsung/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc
rename to universal7885-common/hardware/samsung/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc
diff --git a/universal7885-common/hardware/samsung/hidl/camera/provider/service.cpp b/universal7885-common/hardware/samsung/camera/provider/service.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/camera/provider/service.cpp
rename to universal7885-common/hardware/samsung/camera/provider/service.cpp
diff --git a/universal7885-common/hardware/samsung/hidl/fingerprint/Android.bp b/universal7885-common/hardware/samsung/fingerprint/Android.bp
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/fingerprint/Android.bp
rename to universal7885-common/hardware/samsung/fingerprint/Android.bp
diff --git a/universal7885-common/hardware/samsung/hidl/fingerprint/BiometricsFingerprint.cpp b/universal7885-common/hardware/samsung/fingerprint/BiometricsFingerprint.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/fingerprint/BiometricsFingerprint.cpp
rename to universal7885-common/hardware/samsung/fingerprint/BiometricsFingerprint.cpp
diff --git a/universal7885-common/hardware/samsung/hidl/fingerprint/BiometricsFingerprint.h b/universal7885-common/hardware/samsung/fingerprint/BiometricsFingerprint.h
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/fingerprint/BiometricsFingerprint.h
rename to universal7885-common/hardware/samsung/fingerprint/BiometricsFingerprint.h
diff --git a/universal7885-common/hardware/samsung/hidl/fingerprint/VendorConstants.h b/universal7885-common/hardware/samsung/fingerprint/VendorConstants.h
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/fingerprint/VendorConstants.h
rename to universal7885-common/hardware/samsung/fingerprint/VendorConstants.h
diff --git a/universal7885-common/hardware/samsung/hidl/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.rc b/universal7885-common/hardware/samsung/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.rc
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.rc
rename to universal7885-common/hardware/samsung/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.rc
diff --git a/universal7885-common/hardware/samsung/hidl/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.xml b/universal7885-common/hardware/samsung/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.xml
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.xml
rename to universal7885-common/hardware/samsung/fingerprint/android.hardware.biometrics.fingerprint@2.3-service.samsung.xml
diff --git a/universal7885-common/hardware/samsung/hidl/fingerprint/service.cpp b/universal7885-common/hardware/samsung/fingerprint/service.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/fingerprint/service.cpp
rename to universal7885-common/hardware/samsung/fingerprint/service.cpp
diff --git a/universal7885-common/hardware/samsung/hidl/Android.mk b/universal7885-common/hardware/samsung/hidl/Android.mk
deleted file mode 100644
index c14e909..0000000
--- a/universal7885-common/hardware/samsung/hidl/Android.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
diff --git a/universal7885-common/hardware/samsung/hidl/keymaster/Android.mk b/universal7885-common/hardware/samsung/keymaster/Android.mk
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/keymaster/Android.mk
rename to universal7885-common/hardware/samsung/keymaster/Android.mk
diff --git a/universal7885-common/hardware/samsung/hidl/keymaster/android.hardware.keymaster@4.0-service.samsung.rc b/universal7885-common/hardware/samsung/keymaster/android.hardware.keymaster@4.0-service.samsung.rc
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/keymaster/android.hardware.keymaster@4.0-service.samsung.rc
rename to universal7885-common/hardware/samsung/keymaster/android.hardware.keymaster@4.0-service.samsung.rc
diff --git a/universal7885-common/hardware/samsung/hidl/keymaster/service.cpp b/universal7885-common/hardware/samsung/keymaster/service.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/keymaster/service.cpp
rename to universal7885-common/hardware/samsung/keymaster/service.cpp
diff --git a/universal7885-common/hardware/samsung/aidl/light/Android.bp b/universal7885-common/hardware/samsung/light/Android.bp
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/light/Android.bp
rename to universal7885-common/hardware/samsung/light/Android.bp
diff --git a/universal7885-common/hardware/samsung/aidl/light/Lights.cpp b/universal7885-common/hardware/samsung/light/Lights.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/light/Lights.cpp
rename to universal7885-common/hardware/samsung/light/Lights.cpp
diff --git a/universal7885-common/hardware/samsung/aidl/light/Lights.h b/universal7885-common/hardware/samsung/light/Lights.h
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/light/Lights.h
rename to universal7885-common/hardware/samsung/light/Lights.h
diff --git a/universal7885-common/hardware/samsung/aidl/light/android.hardware.light-service.samsung.rc b/universal7885-common/hardware/samsung/light/android.hardware.light-service.samsung.rc
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/light/android.hardware.light-service.samsung.rc
rename to universal7885-common/hardware/samsung/light/android.hardware.light-service.samsung.rc
diff --git a/universal7885-common/hardware/samsung/aidl/light/android.hardware.light-service.samsung.xml b/universal7885-common/hardware/samsung/light/android.hardware.light-service.samsung.xml
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/light/android.hardware.light-service.samsung.xml
rename to universal7885-common/hardware/samsung/light/android.hardware.light-service.samsung.xml
diff --git a/universal7885-common/hardware/samsung/aidl/light/include/samsung_lights.h b/universal7885-common/hardware/samsung/light/include/samsung_lights.h
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/light/include/samsung_lights.h
rename to universal7885-common/hardware/samsung/light/include/samsung_lights.h
diff --git a/universal7885-common/hardware/samsung/aidl/light/service.cpp b/universal7885-common/hardware/samsung/light/service.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/light/service.cpp
rename to universal7885-common/hardware/samsung/light/service.cpp
diff --git a/universal7885-common/hardware/samsung/aidl/power-libperfmgr/Android.bp b/universal7885-common/hardware/samsung/power-libperfmgr/Android.bp
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/power-libperfmgr/Android.bp
rename to universal7885-common/hardware/samsung/power-libperfmgr/Android.bp
diff --git a/universal7885-common/hardware/samsung/aidl/power-libperfmgr/InteractionHandler.cpp b/universal7885-common/hardware/samsung/power-libperfmgr/InteractionHandler.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/power-libperfmgr/InteractionHandler.cpp
rename to universal7885-common/hardware/samsung/power-libperfmgr/InteractionHandler.cpp
diff --git a/universal7885-common/hardware/samsung/aidl/power-libperfmgr/InteractionHandler.h b/universal7885-common/hardware/samsung/power-libperfmgr/InteractionHandler.h
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/power-libperfmgr/InteractionHandler.h
rename to universal7885-common/hardware/samsung/power-libperfmgr/InteractionHandler.h
diff --git a/universal7885-common/hardware/samsung/aidl/power-libperfmgr/Power.cpp b/universal7885-common/hardware/samsung/power-libperfmgr/Power.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/power-libperfmgr/Power.cpp
rename to universal7885-common/hardware/samsung/power-libperfmgr/Power.cpp
diff --git a/universal7885-common/hardware/samsung/aidl/power-libperfmgr/Power.h b/universal7885-common/hardware/samsung/power-libperfmgr/Power.h
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/power-libperfmgr/Power.h
rename to universal7885-common/hardware/samsung/power-libperfmgr/Power.h
diff --git a/universal7885-common/hardware/samsung/aidl/power-libperfmgr/PowerExt.cpp b/universal7885-common/hardware/samsung/power-libperfmgr/PowerExt.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/power-libperfmgr/PowerExt.cpp
rename to universal7885-common/hardware/samsung/power-libperfmgr/PowerExt.cpp
diff --git a/universal7885-common/hardware/samsung/aidl/power-libperfmgr/PowerExt.h b/universal7885-common/hardware/samsung/power-libperfmgr/PowerExt.h
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/power-libperfmgr/PowerExt.h
rename to universal7885-common/hardware/samsung/power-libperfmgr/PowerExt.h
diff --git a/universal7885-common/hardware/samsung/aidl/power-libperfmgr/android.hardware.power-service.samsung-libperfmgr.rc b/universal7885-common/hardware/samsung/power-libperfmgr/android.hardware.power-service.samsung-libperfmgr.rc
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/power-libperfmgr/android.hardware.power-service.samsung-libperfmgr.rc
rename to universal7885-common/hardware/samsung/power-libperfmgr/android.hardware.power-service.samsung-libperfmgr.rc
diff --git a/universal7885-common/hardware/samsung/aidl/power-libperfmgr/android.hardware.power-service.samsung.xml b/universal7885-common/hardware/samsung/power-libperfmgr/android.hardware.power-service.samsung.xml
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/power-libperfmgr/android.hardware.power-service.samsung.xml
rename to universal7885-common/hardware/samsung/power-libperfmgr/android.hardware.power-service.samsung.xml
diff --git a/universal7885-common/hardware/samsung/aidl/power-libperfmgr/service.cpp b/universal7885-common/hardware/samsung/power-libperfmgr/service.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/power-libperfmgr/service.cpp
rename to universal7885-common/hardware/samsung/power-libperfmgr/service.cpp
diff --git a/universal7885-common/hardware/samsung/hidl/sensors/Android.bp b/universal7885-common/hardware/samsung/sensors/Android.bp
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/sensors/Android.bp
rename to universal7885-common/hardware/samsung/sensors/Android.bp
diff --git a/universal7885-common/hardware/samsung/hidl/sensors/Sensors.cpp b/universal7885-common/hardware/samsung/sensors/Sensors.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/sensors/Sensors.cpp
rename to universal7885-common/hardware/samsung/sensors/Sensors.cpp
diff --git a/universal7885-common/hardware/samsung/hidl/sensors/Sensors.h b/universal7885-common/hardware/samsung/sensors/Sensors.h
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/sensors/Sensors.h
rename to universal7885-common/hardware/samsung/sensors/Sensors.h
diff --git a/universal7885-common/hardware/samsung/hidl/usb/typeb/Android.bp b/universal7885-common/hardware/samsung/usb/typeb/Android.bp
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/usb/typeb/Android.bp
rename to universal7885-common/hardware/samsung/usb/typeb/Android.bp
diff --git a/universal7885-common/hardware/samsung/hidl/usb/typeb/Usb.cpp b/universal7885-common/hardware/samsung/usb/typeb/Usb.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/usb/typeb/Usb.cpp
rename to universal7885-common/hardware/samsung/usb/typeb/Usb.cpp
diff --git a/universal7885-common/hardware/samsung/hidl/usb/typeb/Usb.h b/universal7885-common/hardware/samsung/usb/typeb/Usb.h
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/usb/typeb/Usb.h
rename to universal7885-common/hardware/samsung/usb/typeb/Usb.h
diff --git a/universal7885-common/hardware/samsung/hidl/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/hardware/samsung/hidl/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/hardware/samsung/hidl/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/hardware/samsung/hidl/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/hardware/samsung/hidl/usb/typeb/service.cpp b/universal7885-common/hardware/samsung/usb/typeb/service.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/usb/typeb/service.cpp
rename to universal7885-common/hardware/samsung/usb/typeb/service.cpp
diff --git a/universal7885-common/hardware/samsung/hidl/usb/typec/Android.bp b/universal7885-common/hardware/samsung/usb/typec/Android.bp
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/usb/typec/Android.bp
rename to universal7885-common/hardware/samsung/usb/typec/Android.bp
diff --git a/universal7885-common/hardware/samsung/hidl/usb/typec/Usb.cpp b/universal7885-common/hardware/samsung/usb/typec/Usb.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/usb/typec/Usb.cpp
rename to universal7885-common/hardware/samsung/usb/typec/Usb.cpp
diff --git a/universal7885-common/hardware/samsung/hidl/usb/typec/Usb.h b/universal7885-common/hardware/samsung/usb/typec/Usb.h
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/usb/typec/Usb.h
rename to universal7885-common/hardware/samsung/usb/typec/Usb.h
diff --git a/universal7885-common/hardware/samsung/hidl/usb/typec/android.hardware.usb@1.3-service.samsung.rc b/universal7885-common/hardware/samsung/usb/typec/android.hardware.usb@1.3-service.samsung.rc
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/usb/typec/android.hardware.usb@1.3-service.samsung.rc
rename to universal7885-common/hardware/samsung/usb/typec/android.hardware.usb@1.3-service.samsung.rc
diff --git a/universal7885-common/hardware/samsung/hidl/usb/typec/android.hardware.usb@1.3-service.samsung.xml b/universal7885-common/hardware/samsung/usb/typec/android.hardware.usb@1.3-service.samsung.xml
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/usb/typec/android.hardware.usb@1.3-service.samsung.xml
rename to universal7885-common/hardware/samsung/usb/typec/android.hardware.usb@1.3-service.samsung.xml
diff --git a/universal7885-common/hardware/samsung/hidl/usb/typec/service.cpp b/universal7885-common/hardware/samsung/usb/typec/service.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/hidl/usb/typec/service.cpp
rename to universal7885-common/hardware/samsung/usb/typec/service.cpp
diff --git a/universal7885-common/hardware/samsung/aidl/vibrator/Android.bp b/universal7885-common/hardware/samsung/vibrator/Android.bp
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/vibrator/Android.bp
rename to universal7885-common/hardware/samsung/vibrator/Android.bp
diff --git a/universal7885-common/hardware/samsung/aidl/vibrator/Vibrator.cpp b/universal7885-common/hardware/samsung/vibrator/Vibrator.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/vibrator/Vibrator.cpp
rename to universal7885-common/hardware/samsung/vibrator/Vibrator.cpp
diff --git a/universal7885-common/hardware/samsung/aidl/vibrator/Vibrator.h b/universal7885-common/hardware/samsung/vibrator/Vibrator.h
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/vibrator/Vibrator.h
rename to universal7885-common/hardware/samsung/vibrator/Vibrator.h
diff --git a/universal7885-common/hardware/samsung/aidl/vibrator/android.hardware.vibrator-service.samsung.rc b/universal7885-common/hardware/samsung/vibrator/android.hardware.vibrator-service.samsung.rc
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/vibrator/android.hardware.vibrator-service.samsung.rc
rename to universal7885-common/hardware/samsung/vibrator/android.hardware.vibrator-service.samsung.rc
diff --git a/universal7885-common/hardware/samsung/aidl/vibrator/android.hardware.vibrator-service.samsung.xml b/universal7885-common/hardware/samsung/vibrator/android.hardware.vibrator-service.samsung.xml
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/vibrator/android.hardware.vibrator-service.samsung.xml
rename to universal7885-common/hardware/samsung/vibrator/android.hardware.vibrator-service.samsung.xml
diff --git a/universal7885-common/hardware/samsung/aidl/vibrator/service.cpp b/universal7885-common/hardware/samsung/vibrator/service.cpp
similarity index 100%
rename from universal7885-common/hardware/samsung/aidl/vibrator/service.cpp
rename to universal7885-common/hardware/samsung/vibrator/service.cpp