diff --git a/.gitmodules b/.gitmodules
index f979a74e..b176ca89 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "firmwares/qmk/qmk_firmware"]
-	path = firmwares/qmk/qmk_firmware
+[submodule "src/qmk/qmk_firmware"]
+	path = src/qmk/qmk_firmware
 	url = https://github.com/qmk/qmk_firmware.git
diff --git a/Makefile b/Makefile
index b99c06cd..0453b180 100644
--- a/Makefile
+++ b/Makefile
@@ -9,25 +9,25 @@ git-submodule:
 	git submodule update --init --recursive
 
 qmk-clean:
-	rm -rf firmwares/qmk/qmk_firmware/keyboards/tmp
-	cd firmwares/qmk/qmk_firmware; qmk clean
+	rm -rf src/qmk/qmk_firmware/keyboards/tmp
+	cd src/qmk/qmk_firmware; qmk clean
 
 qmk-init:
 	$(eval KB := ${kb})
 	$(eval KR := ${kr})
 	$(eval KM := ${km})
-	rm -f firmwares/qmk/qmk_firmware/keyboards/tmp/${KB}
-	mkdir -p firmwares/qmk/qmk_firmware/keyboards/tmp
-	ln -s $(shell pwd)/keyboards/${KB}/qmk/qmk_firmware firmwares/qmk/qmk_firmware/keyboards/tmp/${KB}
+	rm -f src/qmk/qmk_firmware/keyboards/tmp/${KB}
+	mkdir -p src/qmk/qmk_firmware/keyboards/tmp
+	ln -s $(shell pwd)/keyboards/${KB}/qmk/qmk_firmware src/qmk/qmk_firmware/keyboards/tmp/${KB}
 
 qmk-compile:
 	$(eval KB := ${kb})
 	$(eval KR := ${kr})
 	$(eval KM := ${km})
-	cd firmwares/qmk/qmk_firmware; qmk compile -kb tmp/${KB}/${KR} -km ${KM}
+	cd src/qmk/qmk_firmware; qmk compile -kb tmp/${KB}/${KR} -km ${KM}
 
 qmk-flash:
 	$(eval KB := ${kb})
 	$(eval KR := ${kr})
 	$(eval KM := ${km})
-	cd firmwares/qmk/qmk_firmware; qmk flash -kb tmp/${KB}/${KR} -km ${KM}
+	cd src/qmk/qmk_firmware; qmk flash -kb tmp/${KB}/${KR} -km ${KM}
diff --git a/firmwares/qmk/qmk_firmware b/src/qmk/qmk_firmware
similarity index 100%
rename from firmwares/qmk/qmk_firmware
rename to src/qmk/qmk_firmware