diff --git a/universal7885-common/camera/provider/Android.bp b/universal7885-common/hidl-packages/camera/provider/Android.bp
similarity index 100%
rename from universal7885-common/camera/provider/Android.bp
rename to universal7885-common/hidl-packages/camera/provider/Android.bp
diff --git a/universal7885-common/camera/provider/SamsungCameraProvider.cpp b/universal7885-common/hidl-packages/camera/provider/SamsungCameraProvider.cpp
similarity index 100%
rename from universal7885-common/camera/provider/SamsungCameraProvider.cpp
rename to universal7885-common/hidl-packages/camera/provider/SamsungCameraProvider.cpp
diff --git a/universal7885-common/camera/provider/SamsungCameraProvider.h b/universal7885-common/hidl-packages/camera/provider/SamsungCameraProvider.h
similarity index 100%
rename from universal7885-common/camera/provider/SamsungCameraProvider.h
rename to universal7885-common/hidl-packages/camera/provider/SamsungCameraProvider.h
diff --git a/universal7885-common/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc b/universal7885-common/hidl-packages/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc
similarity index 100%
rename from universal7885-common/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc
rename to universal7885-common/hidl-packages/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc
diff --git a/universal7885-common/camera/provider/service.cpp b/universal7885-common/hidl-packages/camera/provider/service.cpp
similarity index 100%
rename from universal7885-common/camera/provider/service.cpp
rename to universal7885-common/hidl-packages/camera/provider/service.cpp
diff --git a/universal7885-common/health/Android.bp b/universal7885-common/hidl-packages/health/Android.bp
similarity index 100%
rename from universal7885-common/health/Android.bp
rename to universal7885-common/hidl-packages/health/Android.bp
diff --git a/universal7885-common/health/HealthImpl.cpp b/universal7885-common/hidl-packages/health/HealthImpl.cpp
similarity index 100%
rename from universal7885-common/health/HealthImpl.cpp
rename to universal7885-common/hidl-packages/health/HealthImpl.cpp
diff --git a/universal7885-common/hidl/Android.bp b/universal7885-common/hidl-packages/interfaces/Android.bp
similarity index 100%
rename from universal7885-common/hidl/Android.bp
rename to universal7885-common/hidl-packages/interfaces/Android.bp
diff --git a/universal7885-common/hidl/radio/2.0/Android.bp b/universal7885-common/hidl-packages/interfaces/radio/2.0/Android.bp
similarity index 100%
rename from universal7885-common/hidl/radio/2.0/Android.bp
rename to universal7885-common/hidl-packages/interfaces/radio/2.0/Android.bp
diff --git a/universal7885-common/hidl/radio/2.0/ISehRadio.hal b/universal7885-common/hidl-packages/interfaces/radio/2.0/ISehRadio.hal
similarity index 100%
rename from universal7885-common/hidl/radio/2.0/ISehRadio.hal
rename to universal7885-common/hidl-packages/interfaces/radio/2.0/ISehRadio.hal
diff --git a/universal7885-common/hidl/radio/2.0/ISehRadioIndication.hal b/universal7885-common/hidl-packages/interfaces/radio/2.0/ISehRadioIndication.hal
similarity index 100%
rename from universal7885-common/hidl/radio/2.0/ISehRadioIndication.hal
rename to universal7885-common/hidl-packages/interfaces/radio/2.0/ISehRadioIndication.hal
diff --git a/universal7885-common/hidl/radio/2.0/ISehRadioResponse.hal b/universal7885-common/hidl-packages/interfaces/radio/2.0/ISehRadioResponse.hal
similarity index 100%
rename from universal7885-common/hidl/radio/2.0/ISehRadioResponse.hal
rename to universal7885-common/hidl-packages/interfaces/radio/2.0/ISehRadioResponse.hal
diff --git a/universal7885-common/hidl/radio/2.0/types.hal b/universal7885-common/hidl-packages/interfaces/radio/2.0/types.hal
similarity index 100%
rename from universal7885-common/hidl/radio/2.0/types.hal
rename to universal7885-common/hidl-packages/interfaces/radio/2.0/types.hal
diff --git a/universal7885-common/hidl/radio/2.1/Android.bp b/universal7885-common/hidl-packages/interfaces/radio/2.1/Android.bp
similarity index 100%
rename from universal7885-common/hidl/radio/2.1/Android.bp
rename to universal7885-common/hidl-packages/interfaces/radio/2.1/Android.bp
diff --git a/universal7885-common/hidl/radio/2.1/ISehRadio.hal b/universal7885-common/hidl-packages/interfaces/radio/2.1/ISehRadio.hal
similarity index 100%
rename from universal7885-common/hidl/radio/2.1/ISehRadio.hal
rename to universal7885-common/hidl-packages/interfaces/radio/2.1/ISehRadio.hal
diff --git a/universal7885-common/hidl/radio/2.1/ISehRadioIndication.hal b/universal7885-common/hidl-packages/interfaces/radio/2.1/ISehRadioIndication.hal
similarity index 100%
rename from universal7885-common/hidl/radio/2.1/ISehRadioIndication.hal
rename to universal7885-common/hidl-packages/interfaces/radio/2.1/ISehRadioIndication.hal
diff --git a/universal7885-common/hidl/radio/2.1/ISehRadioResponse.hal b/universal7885-common/hidl-packages/interfaces/radio/2.1/ISehRadioResponse.hal
similarity index 100%
rename from universal7885-common/hidl/radio/2.1/ISehRadioResponse.hal
rename to universal7885-common/hidl-packages/interfaces/radio/2.1/ISehRadioResponse.hal
diff --git a/universal7885-common/hidl/radio/2.1/types.hal b/universal7885-common/hidl-packages/interfaces/radio/2.1/types.hal
similarity index 100%
rename from universal7885-common/hidl/radio/2.1/types.hal
rename to universal7885-common/hidl-packages/interfaces/radio/2.1/types.hal
diff --git a/universal7885-common/hidl/radio/channel/2.0/Android.bp b/universal7885-common/hidl-packages/interfaces/radio/channel/2.0/Android.bp
similarity index 100%
rename from universal7885-common/hidl/radio/channel/2.0/Android.bp
rename to universal7885-common/hidl-packages/interfaces/radio/channel/2.0/Android.bp
diff --git a/universal7885-common/hidl/radio/channel/2.0/ISehChannel.hal b/universal7885-common/hidl-packages/interfaces/radio/channel/2.0/ISehChannel.hal
similarity index 100%
rename from universal7885-common/hidl/radio/channel/2.0/ISehChannel.hal
rename to universal7885-common/hidl-packages/interfaces/radio/channel/2.0/ISehChannel.hal
diff --git a/universal7885-common/hidl/radio/channel/2.0/ISehChannelCallback.hal b/universal7885-common/hidl-packages/interfaces/radio/channel/2.0/ISehChannelCallback.hal
similarity index 100%
rename from universal7885-common/hidl/radio/channel/2.0/ISehChannelCallback.hal
rename to universal7885-common/hidl-packages/interfaces/radio/channel/2.0/ISehChannelCallback.hal
diff --git a/universal7885-common/interfaces/Android.bp b/universal7885-common/hidl-packages/parts/Android.bp
similarity index 100%
rename from universal7885-common/interfaces/Android.bp
rename to universal7885-common/hidl-packages/parts/Android.bp
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.0/Android.bp b/universal7885-common/hidl-packages/parts/hardware/fmradio/1.0/Android.bp
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.0/Android.bp
rename to universal7885-common/hidl-packages/parts/hardware/fmradio/1.0/Android.bp
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.0/IFMRadio.hal b/universal7885-common/hidl-packages/parts/hardware/fmradio/1.0/IFMRadio.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.0/IFMRadio.hal
rename to universal7885-common/hidl-packages/parts/hardware/fmradio/1.0/IFMRadio.hal
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.0/types.hal b/universal7885-common/hidl-packages/parts/hardware/fmradio/1.0/types.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.0/types.hal
rename to universal7885-common/hidl-packages/parts/hardware/fmradio/1.0/types.hal
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.1/Android.bp b/universal7885-common/hidl-packages/parts/hardware/fmradio/1.1/Android.bp
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.1/Android.bp
rename to universal7885-common/hidl-packages/parts/hardware/fmradio/1.1/Android.bp
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.1/IFMRadio.hal b/universal7885-common/hidl-packages/parts/hardware/fmradio/1.1/IFMRadio.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.1/IFMRadio.hal
rename to universal7885-common/hidl-packages/parts/hardware/fmradio/1.1/IFMRadio.hal
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.1/types.hal b/universal7885-common/hidl-packages/parts/hardware/fmradio/1.1/types.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.1/types.hal
rename to universal7885-common/hidl-packages/parts/hardware/fmradio/1.1/types.hal
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.2/Android.bp b/universal7885-common/hidl-packages/parts/hardware/fmradio/1.2/Android.bp
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.2/Android.bp
rename to universal7885-common/hidl-packages/parts/hardware/fmradio/1.2/Android.bp
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.2/IFMRadio.hal b/universal7885-common/hidl-packages/parts/hardware/fmradio/1.2/IFMRadio.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.2/IFMRadio.hal
rename to universal7885-common/hidl-packages/parts/hardware/fmradio/1.2/IFMRadio.hal
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.2/default/Android.bp b/universal7885-common/hidl-packages/parts/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/hidl-packages/parts/hardware/fmradio/1.2/default/Android.bp
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.2/default/FMRadio.cpp b/universal7885-common/hidl-packages/parts/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/hidl-packages/parts/hardware/fmradio/1.2/default/FMRadio.cpp
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.2/default/FMRadio.h b/universal7885-common/hidl-packages/parts/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/hidl-packages/parts/hardware/fmradio/1.2/default/FMRadio.h
diff --git a/universal7885-common/interfaces/hardware/fmradio/1.2/default/service.cpp b/universal7885-common/hidl-packages/parts/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/hidl-packages/parts/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/hidl-packages/parts/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/hidl-packages/parts/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/hidl-packages/parts/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/hidl-packages/parts/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/hidl-packages/parts/hardware/fmradio/1.2/types.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/fmradio/1.2/types.hal
rename to universal7885-common/hidl-packages/parts/hardware/fmradio/1.2/types.hal
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/Android.bp b/universal7885-common/hidl-packages/parts/hardware/parts/1.0/Android.bp
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/Android.bp
rename to universal7885-common/hidl-packages/parts/hardware/parts/1.0/Android.bp
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/IBatteryStats.hal b/universal7885-common/hidl-packages/parts/hardware/parts/1.0/IBatteryStats.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/IBatteryStats.hal
rename to universal7885-common/hidl-packages/parts/hardware/parts/1.0/IBatteryStats.hal
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/IDisplayConfigs.hal b/universal7885-common/hidl-packages/parts/hardware/parts/1.0/IDisplayConfigs.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/IDisplayConfigs.hal
rename to universal7885-common/hidl-packages/parts/hardware/parts/1.0/IDisplayConfigs.hal
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/IFlashBrightness.hal b/universal7885-common/hidl-packages/parts/hardware/parts/1.0/IFlashBrightness.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/IFlashBrightness.hal
rename to universal7885-common/hidl-packages/parts/hardware/parts/1.0/IFlashBrightness.hal
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/ISwapOnData.hal b/universal7885-common/hidl-packages/parts/hardware/parts/1.0/ISwapOnData.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/ISwapOnData.hal
rename to universal7885-common/hidl-packages/parts/hardware/parts/1.0/ISwapOnData.hal
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/Android.bp b/universal7885-common/hidl-packages/parts/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/hidl-packages/parts/hardware/parts/1.0/default/Android.bp
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/Battery.cpp b/universal7885-common/hidl-packages/parts/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/hidl-packages/parts/hardware/parts/1.0/default/Battery.cpp
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/Battery.h b/universal7885-common/hidl-packages/parts/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/hidl-packages/parts/hardware/parts/1.0/default/Battery.h
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/Display.cpp b/universal7885-common/hidl-packages/parts/hardware/parts/1.0/default/Display.cpp
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/default/Display.cpp
rename to universal7885-common/hidl-packages/parts/hardware/parts/1.0/default/Display.cpp
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/Display.h b/universal7885-common/hidl-packages/parts/hardware/parts/1.0/default/Display.h
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/default/Display.h
rename to universal7885-common/hidl-packages/parts/hardware/parts/1.0/default/Display.h
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/FlashLight.cpp b/universal7885-common/hidl-packages/parts/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/hidl-packages/parts/hardware/parts/1.0/default/FlashLight.cpp
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/FlashLight.h b/universal7885-common/hidl-packages/parts/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/hidl-packages/parts/hardware/parts/1.0/default/FlashLight.h
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/Swap.cpp b/universal7885-common/hidl-packages/parts/hardware/parts/1.0/default/Swap.cpp
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/default/Swap.cpp
rename to universal7885-common/hidl-packages/parts/hardware/parts/1.0/default/Swap.cpp
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/Swap.h b/universal7885-common/hidl-packages/parts/hardware/parts/1.0/default/Swap.h
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/default/Swap.h
rename to universal7885-common/hidl-packages/parts/hardware/parts/1.0/default/Swap.h
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/SwapHelpers.cpp b/universal7885-common/hidl-packages/parts/hardware/parts/1.0/default/SwapHelpers.cpp
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/default/SwapHelpers.cpp
rename to universal7885-common/hidl-packages/parts/hardware/parts/1.0/default/SwapHelpers.cpp
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/service.cpp b/universal7885-common/hidl-packages/parts/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/hidl-packages/parts/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/hidl-packages/parts/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/hidl-packages/parts/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/hidl-packages/parts/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/hidl-packages/parts/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/hidl-packages/parts/hardware/parts/1.0/types.hal
similarity index 100%
rename from universal7885-common/interfaces/hardware/parts/1.0/types.hal
rename to universal7885-common/hidl-packages/parts/hardware/parts/1.0/types.hal
diff --git a/universal7885-common/powerstats/Android.bp b/universal7885-common/hidl-packages/powerstats/Android.bp
similarity index 100%
rename from universal7885-common/powerstats/Android.bp
rename to universal7885-common/hidl-packages/powerstats/Android.bp
diff --git a/universal7885-common/powerstats/DevFreq.cc b/universal7885-common/hidl-packages/powerstats/DevFreq.cc
similarity index 100%
rename from universal7885-common/powerstats/DevFreq.cc
rename to universal7885-common/hidl-packages/powerstats/DevFreq.cc
diff --git a/universal7885-common/powerstats/DevFreq.h b/universal7885-common/hidl-packages/powerstats/DevFreq.h
similarity index 100%
rename from universal7885-common/powerstats/DevFreq.h
rename to universal7885-common/hidl-packages/powerstats/DevFreq.h
diff --git a/universal7885-common/powerstats/android.hardware.power.stats-service.exynos7.rc b/universal7885-common/hidl-packages/powerstats/android.hardware.power.stats-service.exynos7.rc
similarity index 100%
rename from universal7885-common/powerstats/android.hardware.power.stats-service.exynos7.rc
rename to universal7885-common/hidl-packages/powerstats/android.hardware.power.stats-service.exynos7.rc
diff --git a/universal7885-common/powerstats/android.hardware.power.stats-service.exynos7.xml b/universal7885-common/hidl-packages/powerstats/android.hardware.power.stats-service.exynos7.xml
similarity index 100%
rename from universal7885-common/powerstats/android.hardware.power.stats-service.exynos7.xml
rename to universal7885-common/hidl-packages/powerstats/android.hardware.power.stats-service.exynos7.xml
diff --git a/universal7885-common/powerstats/main.cc b/universal7885-common/hidl-packages/powerstats/main.cc
similarity index 100%
rename from universal7885-common/powerstats/main.cc
rename to universal7885-common/hidl-packages/powerstats/main.cc
diff --git a/universal7885-common/vendor_detect/main.py b/universal7885-common/host-tools/makefile_generator.py
similarity index 100%
rename from universal7885-common/vendor_detect/main.py
rename to universal7885-common/host-tools/makefile_generator.py
diff --git a/universal7885-common/vendorsetup.sh b/universal7885-common/vendorsetup.sh
index d91fcb5..06b06fc 100755
--- a/universal7885-common/vendorsetup.sh
+++ b/universal7885-common/vendorsetup.sh
@@ -18,7 +18,7 @@ git clone --depth=1 https://github.com/eurekadevelopment/android_vendor_samsung_
 if test -f ${UNIVERSAL}/vendor_name; then
 	rm ${UNIVERSAL}/vendor_name
 fi
-python3 ${UNIVERSAL}/vendor_detect/main.py
+python3 ${UNIVERSAL}/host-tools/makefile_generator.py
 for dev in a10dd a10 a20 a20e a30 a30s a40; do
 	echo "Generating ${dev} Makefiles..."
 	bash ${UNIVERSAL}/setup.sh "$dev"