diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index c5a18c2..65c7f04 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -83,8 +83,8 @@ WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY ?= true
 TARGET_USES_HWC2 := true
 
 # Lineage Hardware
-BOARD_HARDWARE_CLASS += \
-    $(COMMON_PATH)/lineagehw
+JAVA_SOURCE_OVERLAYS := \
+    org.lineageos.hardware|$(COMMON_PATH)/lineagehw|**/*.java
 
 # Partitions
 BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864
diff --git a/lineagehw/org/lineageos/hardware/DisplayModeControl.java b/lineagehw/src/org/lineageos/hardware/DisplayModeControl.java
similarity index 100%
rename from lineagehw/org/lineageos/hardware/DisplayModeControl.java
rename to lineagehw/src/org/lineageos/hardware/DisplayModeControl.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
diff --git a/lineagehw/org/lineageos/hardware/TouchscreenGestures.java b/lineagehw/src/org/lineageos/hardware/TouchscreenGestures.java
similarity index 100%
rename from lineagehw/org/lineageos/hardware/TouchscreenGestures.java
rename to lineagehw/src/org/lineageos/hardware/TouchscreenGestures.java