diff --git a/board/lineagehw.mk b/board/lineagehw.mk
index c915a8b..5870eb1 100644
--- a/board/lineagehw.mk
+++ b/board/lineagehw.mk
@@ -13,5 +13,5 @@
 # limitations under the License.
 #
 
-# Samsung Hardware
-BOARD_HARDWARE_CLASS := device/samsung/exynos7870-common/lineagehw
+# Lineage HW
+JAVA_SOURCE_OVERLAYS := org.lineageos.hardware|device/samsung/exynos7870-common/lineagehw|**/*.java
diff --git a/lineagehw/org/lineageos/hardware/DisplayColorCalibration.java b/lineagehw/src/org/lineageos/hardware/DisplayColorCalibration.java
similarity index 100%
rename from lineagehw/org/lineageos/hardware/DisplayColorCalibration.java
rename to lineagehw/src/org/lineageos/hardware/DisplayColorCalibration.java
diff --git a/lineagehw/org/lineageos/hardware/KeyDisabler.java b/lineagehw/src/org/lineageos/hardware/KeyDisabler.java
similarity index 100%
rename from lineagehw/org/lineageos/hardware/KeyDisabler.java
rename to lineagehw/src/org/lineageos/hardware/KeyDisabler.java
diff --git a/lineagehw/org/lineageos/hardware/SunlightEnhancement.java b/lineagehw/src/org/lineageos/hardware/SunlightEnhancement.java
similarity index 100%
rename from lineagehw/org/lineageos/hardware/SunlightEnhancement.java
rename to lineagehw/src/org/lineageos/hardware/SunlightEnhancement.java