diff --git a/CAD/Leo_muziekdoos_ESP32/Leo_muziekdoos.xlsx b/CAD/Leo_muziekdoos_ESP32/Leo_muziekdoos.xlsx
index 7363e91..f211928 100644
Binary files a/CAD/Leo_muziekdoos_ESP32/Leo_muziekdoos.xlsx and b/CAD/Leo_muziekdoos_ESP32/Leo_muziekdoos.xlsx differ
diff --git a/FW/m5stack_audio/.gitignore b/FW/leo_muziekdoos_esp32/.gitignore
similarity index 100%
rename from FW/m5stack_audio/.gitignore
rename to FW/leo_muziekdoos_esp32/.gitignore
diff --git a/FW/m5stack_audio/data/Billy-Jean.mp3 b/FW/leo_muziekdoos_esp32/data/Billy-Jean.mp3
similarity index 100%
rename from FW/m5stack_audio/data/Billy-Jean.mp3
rename to FW/leo_muziekdoos_esp32/data/Billy-Jean.mp3
diff --git a/FW/m5stack_audio/data/Let_it_be.mp3 b/FW/leo_muziekdoos_esp32/data/Let_it_be.mp3
similarity index 100%
rename from FW/m5stack_audio/data/Let_it_be.mp3
rename to FW/leo_muziekdoos_esp32/data/Let_it_be.mp3
diff --git a/FW/m5stack_audio/data/ringoffire.mp3 b/FW/leo_muziekdoos_esp32/data/ringoffire.mp3
similarity index 100%
rename from FW/m5stack_audio/data/ringoffire.mp3
rename to FW/leo_muziekdoos_esp32/data/ringoffire.mp3
diff --git a/FW/m5stack_audio/data/test.txt b/FW/leo_muziekdoos_esp32/data/test.txt
similarity index 100%
rename from FW/m5stack_audio/data/test.txt
rename to FW/leo_muziekdoos_esp32/data/test.txt
diff --git a/FW/m5stack_audio/include/README b/FW/leo_muziekdoos_esp32/include/README
similarity index 100%
rename from FW/m5stack_audio/include/README
rename to FW/leo_muziekdoos_esp32/include/README
diff --git a/FW/m5stack_audio/lib/README b/FW/leo_muziekdoos_esp32/lib/README
similarity index 100%
rename from FW/m5stack_audio/lib/README
rename to FW/leo_muziekdoos_esp32/lib/README
diff --git a/FW/m5stack_audio/littlefsbuilder.py b/FW/leo_muziekdoos_esp32/littlefsbuilder.py
similarity index 100%
rename from FW/m5stack_audio/littlefsbuilder.py
rename to FW/leo_muziekdoos_esp32/littlefsbuilder.py
diff --git a/FW/m5stack_audio/mklittlefs b/FW/leo_muziekdoos_esp32/mklittlefs
similarity index 100%
rename from FW/m5stack_audio/mklittlefs
rename to FW/leo_muziekdoos_esp32/mklittlefs
diff --git a/FW/m5stack_audio/platformio.ini b/FW/leo_muziekdoos_esp32/platformio.ini
similarity index 100%
rename from FW/m5stack_audio/platformio.ini
rename to FW/leo_muziekdoos_esp32/platformio.ini
diff --git a/FW/m5stack_audio/src/audio.cpp b/FW/leo_muziekdoos_esp32/src/audio.cpp
similarity index 100%
rename from FW/m5stack_audio/src/audio.cpp
rename to FW/leo_muziekdoos_esp32/src/audio.cpp
diff --git a/FW/m5stack_audio/src/audio.h b/FW/leo_muziekdoos_esp32/src/audio.h
similarity index 100%
rename from FW/m5stack_audio/src/audio.h
rename to FW/leo_muziekdoos_esp32/src/audio.h
diff --git a/FW/m5stack_audio/src/board.h b/FW/leo_muziekdoos_esp32/src/board.h
similarity index 100%
rename from FW/m5stack_audio/src/board.h
rename to FW/leo_muziekdoos_esp32/src/board.h
diff --git a/FW/m5stack_audio/src/main.cpp b/FW/leo_muziekdoos_esp32/src/main.cpp
similarity index 100%
rename from FW/m5stack_audio/src/main.cpp
rename to FW/leo_muziekdoos_esp32/src/main.cpp
diff --git a/FW/m5stack_audio/src/rfid.cpp b/FW/leo_muziekdoos_esp32/src/rfid.cpp
similarity index 100%
rename from FW/m5stack_audio/src/rfid.cpp
rename to FW/leo_muziekdoos_esp32/src/rfid.cpp
diff --git a/FW/m5stack_audio/src/rfid.h b/FW/leo_muziekdoos_esp32/src/rfid.h
similarity index 100%
rename from FW/m5stack_audio/src/rfid.h
rename to FW/leo_muziekdoos_esp32/src/rfid.h
diff --git a/FW/m5stack_audio/src/storage.cpp b/FW/leo_muziekdoos_esp32/src/storage.cpp
similarity index 100%
rename from FW/m5stack_audio/src/storage.cpp
rename to FW/leo_muziekdoos_esp32/src/storage.cpp
diff --git a/FW/m5stack_audio/src/storage.h b/FW/leo_muziekdoos_esp32/src/storage.h
similarity index 100%
rename from FW/m5stack_audio/src/storage.h
rename to FW/leo_muziekdoos_esp32/src/storage.h
diff --git a/FW/m5stack_audio/test/README b/FW/leo_muziekdoos_esp32/test/README
similarity index 100%
rename from FW/m5stack_audio/test/README
rename to FW/leo_muziekdoos_esp32/test/README
diff --git a/FW/m5stack_audio/.vscode/extensions.json b/FW/m5stack_audio/.vscode/extensions.json
deleted file mode 100644
index 0f0d740..0000000
--- a/FW/m5stack_audio/.vscode/extensions.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    // See http://go.microsoft.com/fwlink/?LinkId=827846
-    // for the documentation about the extensions.json format
-    "recommendations": [
-        "platformio.platformio-ide"
-    ]
-}
diff --git a/FW/m5stack_audio/.vscode/settings.json b/FW/m5stack_audio/.vscode/settings.json
deleted file mode 100644
index 54dbb91..0000000
--- a/FW/m5stack_audio/.vscode/settings.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "files.associations": {
-    "array": "cpp",
-    "deque": "cpp",
-    "string": "cpp",
-    "unordered_map": "cpp",
-    "unordered_set": "cpp",
-    "vector": "cpp",
-    "initializer_list": "cpp"
-  }
-}
\ No newline at end of file
diff --git a/FW/m5stack_audio/lib/ESP8266Audio b/FW/m5stack_audio/lib/ESP8266Audio
deleted file mode 160000
index 64ecf18..0000000
--- a/FW/m5stack_audio/lib/ESP8266Audio
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 64ecf18a03482f22c1d2a2b4d914220fdd89ecd9
diff --git a/FW/m5stack_audio/lib/LittleFS_esp32 b/FW/m5stack_audio/lib/LittleFS_esp32
deleted file mode 160000
index c1d61f8..0000000
--- a/FW/m5stack_audio/lib/LittleFS_esp32
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c1d61f850e9e146a059adfad156270780ed4f78d
diff --git a/FW/m5stack_audio/lib/RFID.MFRC522 b/FW/m5stack_audio/lib/RFID.MFRC522
deleted file mode 160000
index ba72b92..0000000
--- a/FW/m5stack_audio/lib/RFID.MFRC522
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ba72b92f070e93abe910a28a17c3730f7468d886
diff --git a/FW/m5stack_audio/partitions_custom.csv b/FW/m5stack_audio/partitions_custom.csv
deleted file mode 100644
index 97846fa..0000000
--- a/FW/m5stack_audio/partitions_custom.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-# Name,   Type, SubType,  Offset,   Size,  Flags
-ota_0,     app, ota_0,   0x10000,  0x1A0000,
-ota_1,     app, ota_1,          ,  0x1A0000,
-otadata,  data, ota,    0x350000,  0x2000,
-nvs,      data, nvs,            ,  0x6000,
-data,     data, spiffs,         ,  0xA8000,