diff --git a/lineagehw/hidl/livedisplay/.clang-format b/hidl/livedisplay/.clang-format
similarity index 100%
rename from lineagehw/hidl/livedisplay/.clang-format
rename to hidl/livedisplay/.clang-format
diff --git a/lineagehw/hidl/livedisplay/AdaptiveBacklight.cpp b/hidl/livedisplay/AdaptiveBacklight.cpp
similarity index 100%
rename from lineagehw/hidl/livedisplay/AdaptiveBacklight.cpp
rename to hidl/livedisplay/AdaptiveBacklight.cpp
diff --git a/lineagehw/hidl/livedisplay/AdaptiveBacklight.h b/hidl/livedisplay/AdaptiveBacklight.h
similarity index 100%
rename from lineagehw/hidl/livedisplay/AdaptiveBacklight.h
rename to hidl/livedisplay/AdaptiveBacklight.h
diff --git a/lineagehw/hidl/livedisplay/Android.bp b/hidl/livedisplay/Android.bp
similarity index 100%
rename from lineagehw/hidl/livedisplay/Android.bp
rename to hidl/livedisplay/Android.bp
diff --git a/lineagehw/hidl/livedisplay/DisplayColorCalibration.cpp b/hidl/livedisplay/DisplayColorCalibration.cpp
similarity index 100%
rename from lineagehw/hidl/livedisplay/DisplayColorCalibration.cpp
rename to hidl/livedisplay/DisplayColorCalibration.cpp
diff --git a/lineagehw/hidl/livedisplay/DisplayColorCalibration.h b/hidl/livedisplay/DisplayColorCalibration.h
similarity index 100%
rename from lineagehw/hidl/livedisplay/DisplayColorCalibration.h
rename to hidl/livedisplay/DisplayColorCalibration.h
diff --git a/lineagehw/hidl/livedisplay/DisplayColorCalibrationExynos.cpp b/hidl/livedisplay/DisplayColorCalibrationExynos.cpp
similarity index 100%
rename from lineagehw/hidl/livedisplay/DisplayColorCalibrationExynos.cpp
rename to hidl/livedisplay/DisplayColorCalibrationExynos.cpp
diff --git a/lineagehw/hidl/livedisplay/DisplayColorCalibrationExynos.h b/hidl/livedisplay/DisplayColorCalibrationExynos.h
similarity index 100%
rename from lineagehw/hidl/livedisplay/DisplayColorCalibrationExynos.h
rename to hidl/livedisplay/DisplayColorCalibrationExynos.h
diff --git a/lineagehw/hidl/livedisplay/DisplayModes.cpp b/hidl/livedisplay/DisplayModes.cpp
similarity index 100%
rename from lineagehw/hidl/livedisplay/DisplayModes.cpp
rename to hidl/livedisplay/DisplayModes.cpp
diff --git a/lineagehw/hidl/livedisplay/DisplayModes.h b/hidl/livedisplay/DisplayModes.h
similarity index 100%
rename from lineagehw/hidl/livedisplay/DisplayModes.h
rename to hidl/livedisplay/DisplayModes.h
diff --git a/lineagehw/hidl/livedisplay/ReadingEnhancement.cpp b/hidl/livedisplay/ReadingEnhancement.cpp
similarity index 100%
rename from lineagehw/hidl/livedisplay/ReadingEnhancement.cpp
rename to hidl/livedisplay/ReadingEnhancement.cpp
diff --git a/lineagehw/hidl/livedisplay/ReadingEnhancement.h b/hidl/livedisplay/ReadingEnhancement.h
similarity index 100%
rename from lineagehw/hidl/livedisplay/ReadingEnhancement.h
rename to hidl/livedisplay/ReadingEnhancement.h
diff --git a/lineagehw/hidl/livedisplay/SunlightEnhancement.cpp b/hidl/livedisplay/SunlightEnhancement.cpp
similarity index 100%
rename from lineagehw/hidl/livedisplay/SunlightEnhancement.cpp
rename to hidl/livedisplay/SunlightEnhancement.cpp
diff --git a/lineagehw/hidl/livedisplay/SunlightEnhancement.h b/hidl/livedisplay/SunlightEnhancement.h
similarity index 100%
rename from lineagehw/hidl/livedisplay/SunlightEnhancement.h
rename to hidl/livedisplay/SunlightEnhancement.h
diff --git a/lineagehw/hidl/livedisplay/SunlightEnhancementExynos.cpp b/hidl/livedisplay/SunlightEnhancementExynos.cpp
similarity index 100%
rename from lineagehw/hidl/livedisplay/SunlightEnhancementExynos.cpp
rename to hidl/livedisplay/SunlightEnhancementExynos.cpp
diff --git a/lineagehw/hidl/livedisplay/SunlightEnhancementExynos.h b/hidl/livedisplay/SunlightEnhancementExynos.h
similarity index 100%
rename from lineagehw/hidl/livedisplay/SunlightEnhancementExynos.h
rename to hidl/livedisplay/SunlightEnhancementExynos.h
diff --git a/lineagehw/hidl/livedisplay/lineage.livedisplay@2.0-service.samsung-exynos.rc b/hidl/livedisplay/lineage.livedisplay@2.0-service.samsung-exynos.rc
similarity index 100%
rename from lineagehw/hidl/livedisplay/lineage.livedisplay@2.0-service.samsung-exynos.rc
rename to hidl/livedisplay/lineage.livedisplay@2.0-service.samsung-exynos.rc
diff --git a/lineagehw/hidl/livedisplay/lineage.livedisplay@2.0-service.samsung-qcom.rc b/hidl/livedisplay/lineage.livedisplay@2.0-service.samsung-qcom.rc
similarity index 100%
rename from lineagehw/hidl/livedisplay/lineage.livedisplay@2.0-service.samsung-qcom.rc
rename to hidl/livedisplay/lineage.livedisplay@2.0-service.samsung-qcom.rc
diff --git a/lineagehw/hidl/livedisplay/service.cpp b/hidl/livedisplay/service.cpp
similarity index 100%
rename from lineagehw/hidl/livedisplay/service.cpp
rename to hidl/livedisplay/service.cpp
diff --git a/lineagehw/hidl/livedisplay/serviceExynos.cpp b/hidl/livedisplay/serviceExynos.cpp
similarity index 100%
rename from lineagehw/hidl/livedisplay/serviceExynos.cpp
rename to hidl/livedisplay/serviceExynos.cpp
diff --git a/lineagehw/hidl/livedisplay/vendor.lineage.livedisplay@2.0-service.samsung-exynos.rc b/hidl/livedisplay/vendor.lineage.livedisplay@2.0-service.samsung-exynos.rc
similarity index 100%
rename from lineagehw/hidl/livedisplay/vendor.lineage.livedisplay@2.0-service.samsung-exynos.rc
rename to hidl/livedisplay/vendor.lineage.livedisplay@2.0-service.samsung-exynos.rc
diff --git a/lineagehw/hidl/livedisplay/vendor.lineage.livedisplay@2.0-service.samsung-qcom.rc b/hidl/livedisplay/vendor.lineage.livedisplay@2.0-service.samsung-qcom.rc
similarity index 100%
rename from lineagehw/hidl/livedisplay/vendor.lineage.livedisplay@2.0-service.samsung-qcom.rc
rename to hidl/livedisplay/vendor.lineage.livedisplay@2.0-service.samsung-qcom.rc
diff --git a/lineagehw/hidl/touch/.clang-format b/hidl/touch/.clang-format
similarity index 100%
rename from lineagehw/hidl/touch/.clang-format
rename to hidl/touch/.clang-format
diff --git a/lineagehw/hidl/touch/Android.bp b/hidl/touch/Android.bp
similarity index 100%
rename from lineagehw/hidl/touch/Android.bp
rename to hidl/touch/Android.bp
diff --git a/lineagehw/hidl/touch/GloveMode.cpp b/hidl/touch/GloveMode.cpp
similarity index 100%
rename from lineagehw/hidl/touch/GloveMode.cpp
rename to hidl/touch/GloveMode.cpp
diff --git a/lineagehw/hidl/touch/GloveMode.h b/hidl/touch/GloveMode.h
similarity index 100%
rename from lineagehw/hidl/touch/GloveMode.h
rename to hidl/touch/GloveMode.h
diff --git a/lineagehw/hidl/touch/KeyDisabler.cpp b/hidl/touch/KeyDisabler.cpp
similarity index 100%
rename from lineagehw/hidl/touch/KeyDisabler.cpp
rename to hidl/touch/KeyDisabler.cpp
diff --git a/lineagehw/hidl/touch/KeyDisabler.h b/hidl/touch/KeyDisabler.h
similarity index 100%
rename from lineagehw/hidl/touch/KeyDisabler.h
rename to hidl/touch/KeyDisabler.h
diff --git a/lineagehw/hidl/touch/StylusMode.cpp b/hidl/touch/StylusMode.cpp
similarity index 100%
rename from lineagehw/hidl/touch/StylusMode.cpp
rename to hidl/touch/StylusMode.cpp
diff --git a/lineagehw/hidl/touch/StylusMode.h b/hidl/touch/StylusMode.h
similarity index 100%
rename from lineagehw/hidl/touch/StylusMode.h
rename to hidl/touch/StylusMode.h
diff --git a/lineagehw/hidl/touch/TouchscreenGesture.cpp b/hidl/touch/TouchscreenGesture.cpp
similarity index 100%
rename from lineagehw/hidl/touch/TouchscreenGesture.cpp
rename to hidl/touch/TouchscreenGesture.cpp
diff --git a/lineagehw/hidl/touch/TouchscreenGesture.h b/hidl/touch/TouchscreenGesture.h
similarity index 100%
rename from lineagehw/hidl/touch/TouchscreenGesture.h
rename to hidl/touch/TouchscreenGesture.h
diff --git a/lineagehw/hidl/touch/service.cpp b/hidl/touch/service.cpp
similarity index 100%
rename from lineagehw/hidl/touch/service.cpp
rename to hidl/touch/service.cpp
diff --git a/lineagehw/hidl/touch/vendor.lineage.touch@1.0-service.samsung.rc b/hidl/touch/vendor.lineage.touch@1.0-service.samsung.rc
similarity index 100%
rename from lineagehw/hidl/touch/vendor.lineage.touch@1.0-service.samsung.rc
rename to hidl/touch/vendor.lineage.touch@1.0-service.samsung.rc