diff --git a/Makefile b/overlay/Makefile
similarity index 52%
rename from Makefile
rename to overlay/Makefile
index fc39150..5d924fe 100644
--- a/Makefile
+++ b/overlay/Makefile
@@ -2,12 +2,12 @@ old-dtb := $(dtb-y)
 old-dtbo := $(dtbo-y)
 dtb-y :=
 dtbo-y :=
-makefile-path := platform/t23x/concord/dts/generic-dts
+makefile-path := platform/t23x/concord/dts/generic-dts/overlay
 
-dtbo-y += tegra234-p3737-0000+p3701-0000-overlay.dtbo
-dtbo-y += tegra234-jetson-overlay.dtbo
-dtbo-y += tegra234-carveouts-overlay.dtbo
-dtbo-y += tegra234-sbsa-uart-overlay.dtbo
+dtbo-y += tegra234-p3737-0000+p3701-0000.dtbo
+dtbo-y += tegra234-jetson.dtbo
+dtbo-y += tegra234-carveouts.dtbo
+dtbo-y += tegra234-sbsa-uart.dtbo
 
 ifneq ($(dtb-y),)
 dtb-y := $(addprefix $(makefile-path)/,$(dtb-y))
diff --git a/tegra234-carveouts-overlay.dts b/overlay/tegra234-carveouts.dts
similarity index 100%
rename from tegra234-carveouts-overlay.dts
rename to overlay/tegra234-carveouts.dts
diff --git a/tegra234-dcb-p3737-0000-p3701-0000.dtsi b/overlay/tegra234-dcb-p3737-0000-p3701-0000.dtsi
similarity index 100%
rename from tegra234-dcb-p3737-0000-p3701-0000.dtsi
rename to overlay/tegra234-dcb-p3737-0000-p3701-0000.dtsi
diff --git a/tegra234-jetson-overlay.dts b/overlay/tegra234-jetson.dts
similarity index 100%
rename from tegra234-jetson-overlay.dts
rename to overlay/tegra234-jetson.dts
diff --git a/tegra234-p3701-0000-overlay.dtsi b/overlay/tegra234-p3701-0000.dtsi
similarity index 100%
rename from tegra234-p3701-0000-overlay.dtsi
rename to overlay/tegra234-p3701-0000.dtsi
diff --git a/tegra234-p3737-0000+p3701-0000-overlay.dts b/overlay/tegra234-p3737-0000+p3701-0000.dts
similarity index 98%
rename from tegra234-p3737-0000+p3701-0000-overlay.dts
rename to overlay/tegra234-p3737-0000+p3701-0000.dts
index 94de010..2252414 100644
--- a/tegra234-p3737-0000+p3701-0000-overlay.dts
+++ b/overlay/tegra234-p3737-0000+p3701-0000.dts
@@ -6,8 +6,8 @@
 /plugin/;
 
 #include "overlay/tegra234-soc-overlay.dtsi"
-#include "tegra234-p3737-0000-overlay.dtsi"
-#include "tegra234-p3701-0000-overlay.dtsi"
+#include "tegra234-p3737-0000.dtsi"
+#include "tegra234-p3701-0000.dtsi"
 #include "overlay/tegra234-audio-dai-links-overlay.dtsi"
 #include "tegra234-dcb-p3737-0000-p3701-0000.dtsi"
 
diff --git a/tegra234-p3737-0000-overlay.dtsi b/overlay/tegra234-p3737-0000.dtsi
similarity index 100%
rename from tegra234-p3737-0000-overlay.dtsi
rename to overlay/tegra234-p3737-0000.dtsi
diff --git a/tegra234-sbsa-uart-overlay.dts b/overlay/tegra234-sbsa-uart.dts
similarity index 100%
rename from tegra234-sbsa-uart-overlay.dts
rename to overlay/tegra234-sbsa-uart.dts