diff --git a/.gitmodules b/.gitmodules
index 9d2b492..ba410d9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "esp-idf"]
-	path = esp-idf
+	path = software/esp-idf
 	url = https://github.com/espressif/esp-idf.git
diff --git a/.gitignore b/software/.gitignore
similarity index 100%
rename from .gitignore
rename to software/.gitignore
diff --git a/CMakeLists.txt b/software/CMakeLists.txt
similarity index 100%
rename from CMakeLists.txt
rename to software/CMakeLists.txt
diff --git a/esp-idf b/software/esp-idf
similarity index 100%
rename from esp-idf
rename to software/esp-idf
diff --git a/main/CMakeLists.txt b/software/main/CMakeLists.txt
similarity index 100%
rename from main/CMakeLists.txt
rename to software/main/CMakeLists.txt
diff --git a/main/assets/connect.wav b/software/main/assets/connect.wav
similarity index 100%
rename from main/assets/connect.wav
rename to software/main/assets/connect.wav
diff --git a/main/assets/disconnect.wav b/software/main/assets/disconnect.wav
similarity index 100%
rename from main/assets/disconnect.wav
rename to software/main/assets/disconnect.wav
diff --git a/main/include/a2dp.h b/software/main/include/a2dp.h
similarity index 100%
rename from main/include/a2dp.h
rename to software/main/include/a2dp.h
diff --git a/main/include/avrcp.h b/software/main/include/avrcp.h
similarity index 100%
rename from main/include/avrcp.h
rename to software/main/include/avrcp.h
diff --git a/main/include/bluetooth.h b/software/main/include/bluetooth.h
similarity index 100%
rename from main/include/bluetooth.h
rename to software/main/include/bluetooth.h
diff --git a/main/include/helper.h b/software/main/include/helper.h
similarity index 100%
rename from main/include/helper.h
rename to software/main/include/helper.h
diff --git a/main/include/i2s.h b/software/main/include/i2s.h
similarity index 100%
rename from main/include/i2s.h
rename to software/main/include/i2s.h
diff --git a/main/include/storage.h b/software/main/include/storage.h
similarity index 100%
rename from main/include/storage.h
rename to software/main/include/storage.h
diff --git a/main/include/wav.h b/software/main/include/wav.h
similarity index 100%
rename from main/include/wav.h
rename to software/main/include/wav.h
diff --git a/main/src/a2dp.cpp b/software/main/src/a2dp.cpp
similarity index 100%
rename from main/src/a2dp.cpp
rename to software/main/src/a2dp.cpp
diff --git a/main/src/avrcp.cpp b/software/main/src/avrcp.cpp
similarity index 100%
rename from main/src/avrcp.cpp
rename to software/main/src/avrcp.cpp
diff --git a/main/src/bluetooth.cpp b/software/main/src/bluetooth.cpp
similarity index 100%
rename from main/src/bluetooth.cpp
rename to software/main/src/bluetooth.cpp
diff --git a/main/src/helper.cpp b/software/main/src/helper.cpp
similarity index 100%
rename from main/src/helper.cpp
rename to software/main/src/helper.cpp
diff --git a/main/src/i2s.cpp b/software/main/src/i2s.cpp
similarity index 100%
rename from main/src/i2s.cpp
rename to software/main/src/i2s.cpp
diff --git a/main/src/main.cpp b/software/main/src/main.cpp
similarity index 100%
rename from main/src/main.cpp
rename to software/main/src/main.cpp
diff --git a/main/src/storage.cpp b/software/main/src/storage.cpp
similarity index 100%
rename from main/src/storage.cpp
rename to software/main/src/storage.cpp
diff --git a/main/src/wav.cpp b/software/main/src/wav.cpp
similarity index 100%
rename from main/src/wav.cpp
rename to software/main/src/wav.cpp
diff --git a/sdkconfig b/software/sdkconfig
similarity index 100%
rename from sdkconfig
rename to software/sdkconfig
diff --git a/source.sh b/software/source.sh
similarity index 100%
rename from source.sh
rename to software/source.sh