diff --git a/.gitmodules b/.gitmodules
index 7336445..07c7a5a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "libDaisy"]
-	path = libDaisy
+	path = lib/libDaisy
 	url = git@github.com:electro-smith/libDaisy.git
 [submodule "daisySP"]
-	path = daisySP
+	path = lib/daisySP
 	url = git@github.com:electro-smith/DaisySP.git
diff --git a/Makefile b/Makefile
index 6eea08a..2a49b7d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@ TARGET = Main
 
 CPP_SOURCES = src/main.cpp
 
-LIBDAISY_DIR = ./libDaisy
-DAISYSP_DIR = ./daisySP
+LIBDAISY_DIR = ./lib/libDaisy
+DAISYSP_DIR = ./lib/daisySP
 
 SYSTEM_FILES_DIR = $(LIBDAISY_DIR)/core
 include $(SYSTEM_FILES_DIR)/Makefile
diff --git a/README.md b/README.md
index 9a8b261..ca9d862 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ git push
 ```
 2. Build project
 ```sh
-cd daisySP && make && cd ../libDaisy && make && cd .. && make
+cd ./lib/daisySP && make && cd ../libDaisy && make && cd ../.. && make
 ```
 3. Plug usb into Daisy. Enter bootloader mode by holding the BOOT button down, and then pressing the RESET button. Once you release the RESET button, you can also let go of the BOOT button
 4. Write the binary to the Daisy
diff --git a/daisySP b/lib/daisySP
similarity index 100%
rename from daisySP
rename to lib/daisySP
diff --git a/libDaisy b/lib/libDaisy
similarity index 100%
rename from libDaisy
rename to lib/libDaisy