diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 68d7bce..8acabdf 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -131,7 +131,7 @@ TARGET_KERNEL_SOURCE := kernel/xiaomi/msm8937
 TARGET_PROVIDES_LIBLIGHT := true
 
 # Lineage Hardware
-BOARD_HARDWARE_CLASS += $(VENDOR_PATH)/lineagehw
+JAVA_SOURCE_OVERLAYS := org.lineageos.hardware|$(VENDOR_PATH)/lineagehw|**/*.java
 
 # Malloc
 MALLOC_SVELTE := true
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