diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 6dd20c3..aceae2b 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -170,9 +170,9 @@ TARGET_PLATFORM_DEVICE_BASE := /devices/soc.0/
 TARGET_PROVIDES_KEYMASTER := true
 
 # Lineage hardware
-BOARD_HARDWARE_CLASS += \
-    hardware/samsung/lineagehw \
-    $(VENDOR_PATH)/lineagehw
+JAVA_SOURCE_OVERLAYS := \
+    org.lineageos.hardware|hardware/samsung/lineagehw|**/*.java \
+    org.lineageos.hardware|$(VENDOR_PATH)/lineagehw|**/*.java
 
 # Peripheral manager
 TARGET_PER_MGR_ENABLED := true
diff --git a/lineagehw/org/lineage/hardware/ReadingEnhancement.java b/lineagehw/src/org/lineageos/hardware/ReadingEnhancement.java
similarity index 100%
rename from lineagehw/org/lineage/hardware/ReadingEnhancement.java
rename to lineagehw/src/org/lineageos/hardware/ReadingEnhancement.java