diff --git a/esp32_fw/.clang-format b/ESP32_AP-Flasher/.clang-format
similarity index 100%
rename from esp32_fw/.clang-format
rename to ESP32_AP-Flasher/.clang-format
diff --git a/esp32_fw/.gitignore b/ESP32_AP-Flasher/.gitignore
similarity index 100%
rename from esp32_fw/.gitignore
rename to ESP32_AP-Flasher/.gitignore
diff --git a/esp32_fw/.vscode/extensions.json b/ESP32_AP-Flasher/.vscode/extensions.json
similarity index 100%
rename from esp32_fw/.vscode/extensions.json
rename to ESP32_AP-Flasher/.vscode/extensions.json
diff --git a/esp32_fw/.vscode/settings.json b/ESP32_AP-Flasher/.vscode/settings.json
similarity index 100%
rename from esp32_fw/.vscode/settings.json
rename to ESP32_AP-Flasher/.vscode/settings.json
diff --git a/esp32_fw/CMakeLists.txt b/ESP32_AP-Flasher/CMakeLists.txt
similarity index 100%
rename from esp32_fw/CMakeLists.txt
rename to ESP32_AP-Flasher/CMakeLists.txt
diff --git a/esp32_fw/data/alignment.bmp b/ESP32_AP-Flasher/data/alignment.bmp
similarity index 100%
rename from esp32_fw/data/alignment.bmp
rename to ESP32_AP-Flasher/data/alignment.bmp
diff --git a/esp32_fw/data/fonts/GillSC16.vlw b/ESP32_AP-Flasher/data/fonts/GillSC16.vlw
similarity index 100%
rename from esp32_fw/data/fonts/GillSC16.vlw
rename to ESP32_AP-Flasher/data/fonts/GillSC16.vlw
diff --git a/esp32_fw/data/fonts/GillSC20.vlw b/ESP32_AP-Flasher/data/fonts/GillSC20.vlw
similarity index 100%
rename from esp32_fw/data/fonts/GillSC20.vlw
rename to ESP32_AP-Flasher/data/fonts/GillSC20.vlw
diff --git a/esp32_fw/data/fonts/bahnschrift20.vlw b/ESP32_AP-Flasher/data/fonts/bahnschrift20.vlw
similarity index 100%
rename from esp32_fw/data/fonts/bahnschrift20.vlw
rename to ESP32_AP-Flasher/data/fonts/bahnschrift20.vlw
diff --git a/esp32_fw/data/fonts/bahnschrift30.vlw b/ESP32_AP-Flasher/data/fonts/bahnschrift30.vlw
similarity index 100%
rename from esp32_fw/data/fonts/bahnschrift30.vlw
rename to ESP32_AP-Flasher/data/fonts/bahnschrift30.vlw
diff --git a/esp32_fw/data/fonts/bahnschrift70.vlw b/ESP32_AP-Flasher/data/fonts/bahnschrift70.vlw
similarity index 100%
rename from esp32_fw/data/fonts/bahnschrift70.vlw
rename to ESP32_AP-Flasher/data/fonts/bahnschrift70.vlw
diff --git a/esp32_fw/data/fonts/bahnschrift80.vlw b/ESP32_AP-Flasher/data/fonts/bahnschrift80.vlw
similarity index 100%
rename from esp32_fw/data/fonts/bahnschrift80.vlw
rename to ESP32_AP-Flasher/data/fonts/bahnschrift80.vlw
diff --git a/esp32_fw/data/fonts/calibrib30.vlw b/ESP32_AP-Flasher/data/fonts/calibrib30.vlw
similarity index 100%
rename from esp32_fw/data/fonts/calibrib30.vlw
rename to ESP32_AP-Flasher/data/fonts/calibrib30.vlw
diff --git a/esp32_fw/data/fonts/calibrib35.vlw b/ESP32_AP-Flasher/data/fonts/calibrib35.vlw
similarity index 100%
rename from esp32_fw/data/fonts/calibrib35.vlw
rename to ESP32_AP-Flasher/data/fonts/calibrib35.vlw
diff --git a/esp32_fw/data/fonts/calibrib40.vlw b/ESP32_AP-Flasher/data/fonts/calibrib40.vlw
similarity index 100%
rename from esp32_fw/data/fonts/calibrib40.vlw
rename to ESP32_AP-Flasher/data/fonts/calibrib40.vlw
diff --git a/esp32_fw/data/fonts/calibrib50.vlw b/ESP32_AP-Flasher/data/fonts/calibrib50.vlw
similarity index 100%
rename from esp32_fw/data/fonts/calibrib50.vlw
rename to ESP32_AP-Flasher/data/fonts/calibrib50.vlw
diff --git a/esp32_fw/data/fonts/calibrib62.vlw b/ESP32_AP-Flasher/data/fonts/calibrib62.vlw
similarity index 100%
rename from esp32_fw/data/fonts/calibrib62.vlw
rename to ESP32_AP-Flasher/data/fonts/calibrib62.vlw
diff --git a/esp32_fw/data/fonts/numbers1-1.vlw b/ESP32_AP-Flasher/data/fonts/numbers1-1.vlw
similarity index 100%
rename from esp32_fw/data/fonts/numbers1-1.vlw
rename to ESP32_AP-Flasher/data/fonts/numbers1-1.vlw
diff --git a/esp32_fw/data/fonts/numbers1-2.vlw b/ESP32_AP-Flasher/data/fonts/numbers1-2.vlw
similarity index 100%
rename from esp32_fw/data/fonts/numbers1-2.vlw
rename to ESP32_AP-Flasher/data/fonts/numbers1-2.vlw
diff --git a/esp32_fw/data/fonts/numbers2-1.vlw b/ESP32_AP-Flasher/data/fonts/numbers2-1.vlw
similarity index 100%
rename from esp32_fw/data/fonts/numbers2-1.vlw
rename to ESP32_AP-Flasher/data/fonts/numbers2-1.vlw
diff --git a/esp32_fw/data/fonts/numbers2-2.vlw b/ESP32_AP-Flasher/data/fonts/numbers2-2.vlw
similarity index 100%
rename from esp32_fw/data/fonts/numbers2-2.vlw
rename to ESP32_AP-Flasher/data/fonts/numbers2-2.vlw
diff --git a/esp32_fw/data/fonts/numbers3-1.vlw b/ESP32_AP-Flasher/data/fonts/numbers3-1.vlw
similarity index 100%
rename from esp32_fw/data/fonts/numbers3-1.vlw
rename to ESP32_AP-Flasher/data/fonts/numbers3-1.vlw
diff --git a/esp32_fw/data/fonts/numbers3-2.vlw b/ESP32_AP-Flasher/data/fonts/numbers3-2.vlw
similarity index 100%
rename from esp32_fw/data/fonts/numbers3-2.vlw
rename to ESP32_AP-Flasher/data/fonts/numbers3-2.vlw
diff --git a/esp32_fw/data/fonts/tw20.vlw b/ESP32_AP-Flasher/data/fonts/tw20.vlw
similarity index 100%
rename from esp32_fw/data/fonts/tw20.vlw
rename to ESP32_AP-Flasher/data/fonts/tw20.vlw
diff --git a/esp32_fw/data/fonts/twbold20.vlw b/ESP32_AP-Flasher/data/fonts/twbold20.vlw
similarity index 100%
rename from esp32_fw/data/fonts/twbold20.vlw
rename to ESP32_AP-Flasher/data/fonts/twbold20.vlw
diff --git a/esp32_fw/data/fonts/weathericons30.vlw b/ESP32_AP-Flasher/data/fonts/weathericons30.vlw
similarity index 100%
rename from esp32_fw/data/fonts/weathericons30.vlw
rename to ESP32_AP-Flasher/data/fonts/weathericons30.vlw
diff --git a/esp32_fw/data/fonts/weathericons70.vlw b/ESP32_AP-Flasher/data/fonts/weathericons70.vlw
similarity index 100%
rename from esp32_fw/data/fonts/weathericons70.vlw
rename to ESP32_AP-Flasher/data/fonts/weathericons70.vlw
diff --git a/esp32_fw/data/fonts/weathericons78.vlw b/ESP32_AP-Flasher/data/fonts/weathericons78.vlw
similarity index 100%
rename from esp32_fw/data/fonts/weathericons78.vlw
rename to ESP32_AP-Flasher/data/fonts/weathericons78.vlw
diff --git a/esp32_fw/data/kat-bw29.jpg b/ESP32_AP-Flasher/data/kat-bw29.jpg
similarity index 100%
rename from esp32_fw/data/kat-bw29.jpg
rename to ESP32_AP-Flasher/data/kat-bw29.jpg
diff --git a/esp32_fw/data/test154.bmp b/ESP32_AP-Flasher/data/test154.bmp
similarity index 100%
rename from esp32_fw/data/test154.bmp
rename to ESP32_AP-Flasher/data/test154.bmp
diff --git a/esp32_fw/data/test29.bmp b/ESP32_AP-Flasher/data/test29.bmp
similarity index 100%
rename from esp32_fw/data/test29.bmp
rename to ESP32_AP-Flasher/data/test29.bmp
diff --git a/esp32_fw/data/test42.bmp b/ESP32_AP-Flasher/data/test42.bmp
similarity index 100%
rename from esp32_fw/data/test42.bmp
rename to ESP32_AP-Flasher/data/test42.bmp
diff --git a/esp32_fw/data/www/edit.html b/ESP32_AP-Flasher/data/www/edit.html
similarity index 100%
rename from esp32_fw/data/www/edit.html
rename to ESP32_AP-Flasher/data/www/edit.html
diff --git a/esp32_fw/data/www/index.html b/ESP32_AP-Flasher/data/www/index.html
similarity index 100%
rename from esp32_fw/data/www/index.html
rename to ESP32_AP-Flasher/data/www/index.html
diff --git a/esp32_fw/data/www/main.css b/ESP32_AP-Flasher/data/www/main.css
similarity index 100%
rename from esp32_fw/data/www/main.css
rename to ESP32_AP-Flasher/data/www/main.css
diff --git a/esp32_fw/data/www/main.js b/ESP32_AP-Flasher/data/www/main.js
similarity index 100%
rename from esp32_fw/data/www/main.js
rename to ESP32_AP-Flasher/data/www/main.js
diff --git a/esp32_fw/dependencies.lock b/ESP32_AP-Flasher/dependencies.lock
similarity index 100%
rename from esp32_fw/dependencies.lock
rename to ESP32_AP-Flasher/dependencies.lock
diff --git a/esp32_fw/include/commstructs.h b/ESP32_AP-Flasher/include/commstructs.h
similarity index 100%
rename from esp32_fw/include/commstructs.h
rename to ESP32_AP-Flasher/include/commstructs.h
diff --git a/esp32_fw/include/contentmanager.h b/ESP32_AP-Flasher/include/contentmanager.h
similarity index 100%
rename from esp32_fw/include/contentmanager.h
rename to ESP32_AP-Flasher/include/contentmanager.h
diff --git a/esp32_fw/include/flasher.h b/ESP32_AP-Flasher/include/flasher.h
similarity index 100%
rename from esp32_fw/include/flasher.h
rename to ESP32_AP-Flasher/include/flasher.h
diff --git a/esp32_fw/include/leds.h b/ESP32_AP-Flasher/include/leds.h
similarity index 100%
rename from esp32_fw/include/leds.h
rename to ESP32_AP-Flasher/include/leds.h
diff --git a/esp32_fw/include/makeimage.h b/ESP32_AP-Flasher/include/makeimage.h
similarity index 100%
rename from esp32_fw/include/makeimage.h
rename to ESP32_AP-Flasher/include/makeimage.h
diff --git a/esp32_fw/include/newproto.h b/ESP32_AP-Flasher/include/newproto.h
similarity index 100%
rename from esp32_fw/include/newproto.h
rename to ESP32_AP-Flasher/include/newproto.h
diff --git a/esp32_fw/include/pendingdata.h b/ESP32_AP-Flasher/include/pendingdata.h
similarity index 100%
rename from esp32_fw/include/pendingdata.h
rename to ESP32_AP-Flasher/include/pendingdata.h
diff --git a/esp32_fw/include/powermgt.h b/ESP32_AP-Flasher/include/powermgt.h
similarity index 100%
rename from esp32_fw/include/powermgt.h
rename to ESP32_AP-Flasher/include/powermgt.h
diff --git a/esp32_fw/include/serial.h b/ESP32_AP-Flasher/include/serial.h
similarity index 100%
rename from esp32_fw/include/serial.h
rename to ESP32_AP-Flasher/include/serial.h
diff --git a/esp32_fw/include/settings.h b/ESP32_AP-Flasher/include/settings.h
similarity index 100%
rename from esp32_fw/include/settings.h
rename to ESP32_AP-Flasher/include/settings.h
diff --git a/esp32_fw/include/tag_db.h b/ESP32_AP-Flasher/include/tag_db.h
similarity index 100%
rename from esp32_fw/include/tag_db.h
rename to ESP32_AP-Flasher/include/tag_db.h
diff --git a/esp32_fw/include/usbflasher.h b/ESP32_AP-Flasher/include/usbflasher.h
similarity index 100%
rename from esp32_fw/include/usbflasher.h
rename to ESP32_AP-Flasher/include/usbflasher.h
diff --git a/esp32_fw/include/web.h b/ESP32_AP-Flasher/include/web.h
similarity index 100%
rename from esp32_fw/include/web.h
rename to ESP32_AP-Flasher/include/web.h
diff --git a/esp32_fw/include/zbs_interface.h b/ESP32_AP-Flasher/include/zbs_interface.h
similarity index 100%
rename from esp32_fw/include/zbs_interface.h
rename to ESP32_AP-Flasher/include/zbs_interface.h
diff --git a/esp32_fw/lib/README b/ESP32_AP-Flasher/lib/README
similarity index 100%
rename from esp32_fw/lib/README
rename to ESP32_AP-Flasher/lib/README
diff --git a/esp32_fw/platformio.ini b/ESP32_AP-Flasher/platformio.ini
similarity index 100%
rename from esp32_fw/platformio.ini
rename to ESP32_AP-Flasher/platformio.ini
diff --git a/esp32_fw/readtest.bin2 b/ESP32_AP-Flasher/readtest.bin2
similarity index 100%
rename from esp32_fw/readtest.bin2
rename to ESP32_AP-Flasher/readtest.bin2
diff --git a/esp32_fw/sdkconfig.openepaperlink-flasher-ap b/ESP32_AP-Flasher/sdkconfig.openepaperlink-flasher-ap
similarity index 100%
rename from esp32_fw/sdkconfig.openepaperlink-flasher-ap
rename to ESP32_AP-Flasher/sdkconfig.openepaperlink-flasher-ap
diff --git a/esp32_fw/src/CMakeLists.txt b/ESP32_AP-Flasher/src/CMakeLists.txt
similarity index 100%
rename from esp32_fw/src/CMakeLists.txt
rename to ESP32_AP-Flasher/src/CMakeLists.txt
diff --git a/esp32_fw/src/SPIFFSEditor.cpp b/ESP32_AP-Flasher/src/SPIFFSEditor.cpp
similarity index 100%
rename from esp32_fw/src/SPIFFSEditor.cpp
rename to ESP32_AP-Flasher/src/SPIFFSEditor.cpp
diff --git a/esp32_fw/src/contentmanager.cpp b/ESP32_AP-Flasher/src/contentmanager.cpp
similarity index 100%
rename from esp32_fw/src/contentmanager.cpp
rename to ESP32_AP-Flasher/src/contentmanager.cpp
diff --git a/esp32_fw/src/flasher.cpp b/ESP32_AP-Flasher/src/flasher.cpp
similarity index 100%
rename from esp32_fw/src/flasher.cpp
rename to ESP32_AP-Flasher/src/flasher.cpp
diff --git a/esp32_fw/src/leds.cpp b/ESP32_AP-Flasher/src/leds.cpp
similarity index 100%
rename from esp32_fw/src/leds.cpp
rename to ESP32_AP-Flasher/src/leds.cpp
diff --git a/esp32_fw/src/main.cpp b/ESP32_AP-Flasher/src/main.cpp
similarity index 100%
rename from esp32_fw/src/main.cpp
rename to ESP32_AP-Flasher/src/main.cpp
diff --git a/esp32_fw/src/makeimage.cpp b/ESP32_AP-Flasher/src/makeimage.cpp
similarity index 100%
rename from esp32_fw/src/makeimage.cpp
rename to ESP32_AP-Flasher/src/makeimage.cpp
diff --git a/esp32_fw/src/newproto.cpp b/ESP32_AP-Flasher/src/newproto.cpp
similarity index 100%
rename from esp32_fw/src/newproto.cpp
rename to ESP32_AP-Flasher/src/newproto.cpp
diff --git a/esp32_fw/src/pendingdata.cpp b/ESP32_AP-Flasher/src/pendingdata.cpp
similarity index 100%
rename from esp32_fw/src/pendingdata.cpp
rename to ESP32_AP-Flasher/src/pendingdata.cpp
diff --git a/esp32_fw/src/powermgt.cpp b/ESP32_AP-Flasher/src/powermgt.cpp
similarity index 100%
rename from esp32_fw/src/powermgt.cpp
rename to ESP32_AP-Flasher/src/powermgt.cpp
diff --git a/esp32_fw/src/serial.cpp b/ESP32_AP-Flasher/src/serial.cpp
similarity index 100%
rename from esp32_fw/src/serial.cpp
rename to ESP32_AP-Flasher/src/serial.cpp
diff --git a/esp32_fw/src/tag_db.cpp b/ESP32_AP-Flasher/src/tag_db.cpp
similarity index 100%
rename from esp32_fw/src/tag_db.cpp
rename to ESP32_AP-Flasher/src/tag_db.cpp
diff --git a/esp32_fw/src/usbflasher.cpp b/ESP32_AP-Flasher/src/usbflasher.cpp
similarity index 100%
rename from esp32_fw/src/usbflasher.cpp
rename to ESP32_AP-Flasher/src/usbflasher.cpp
diff --git a/esp32_fw/src/web.cpp b/ESP32_AP-Flasher/src/web.cpp
similarity index 100%
rename from esp32_fw/src/web.cpp
rename to ESP32_AP-Flasher/src/web.cpp
diff --git a/esp32_fw/src/zbs_interface.cpp b/ESP32_AP-Flasher/src/zbs_interface.cpp
similarity index 100%
rename from esp32_fw/src/zbs_interface.cpp
rename to ESP32_AP-Flasher/src/zbs_interface.cpp
diff --git a/esp32_fw/test.bin2 b/ESP32_AP-Flasher/test.bin2
similarity index 100%
rename from esp32_fw/test.bin2
rename to ESP32_AP-Flasher/test.bin2
diff --git a/esp32_fw/test/README b/ESP32_AP-Flasher/test/README
similarity index 100%
rename from esp32_fw/test/README
rename to ESP32_AP-Flasher/test/README
diff --git a/PCB-jig/README.md b/PCB/README.md
similarity index 100%
rename from PCB-jig/README.md
rename to PCB/README.md
diff --git a/PCB-jig/epapertagjig-cam.brd b/PCB/epapertagjig-cam.brd
similarity index 100%
rename from PCB-jig/epapertagjig-cam.brd
rename to PCB/epapertagjig-cam.brd
diff --git a/PCB-jig/epapertagjig.brd b/PCB/epapertagjig.brd
similarity index 100%
rename from PCB-jig/epapertagjig.brd
rename to PCB/epapertagjig.brd
diff --git a/PCB-jig/epapertagjig.sch b/PCB/epapertagjig.sch
similarity index 100%
rename from PCB-jig/epapertagjig.sch
rename to PCB/epapertagjig.sch
diff --git a/PCB-jig/epapertagjig.zip b/PCB/epapertagjig.zip
similarity index 100%
rename from PCB-jig/epapertagjig.zip
rename to PCB/epapertagjig.zip
diff --git a/PCB-jig/gerbv-board.png b/PCB/gerbv-board.png
similarity index 100%
rename from PCB-jig/gerbv-board.png
rename to PCB/gerbv-board.png
diff --git a/PCB-jig/gerbview/epapertagjig-cam.GBL b/PCB/gerbview/epapertagjig-cam.GBL
similarity index 100%
rename from PCB-jig/gerbview/epapertagjig-cam.GBL
rename to PCB/gerbview/epapertagjig-cam.GBL
diff --git a/PCB-jig/gerbview/epapertagjig-cam.GBO b/PCB/gerbview/epapertagjig-cam.GBO
similarity index 100%
rename from PCB-jig/gerbview/epapertagjig-cam.GBO
rename to PCB/gerbview/epapertagjig-cam.GBO
diff --git a/PCB-jig/gerbview/epapertagjig-cam.GBP b/PCB/gerbview/epapertagjig-cam.GBP
similarity index 100%
rename from PCB-jig/gerbview/epapertagjig-cam.GBP
rename to PCB/gerbview/epapertagjig-cam.GBP
diff --git a/PCB-jig/gerbview/epapertagjig-cam.GBS b/PCB/gerbview/epapertagjig-cam.GBS
similarity index 100%
rename from PCB-jig/gerbview/epapertagjig-cam.GBS
rename to PCB/gerbview/epapertagjig-cam.GBS
diff --git a/PCB-jig/gerbview/epapertagjig-cam.GML b/PCB/gerbview/epapertagjig-cam.GML
similarity index 100%
rename from PCB-jig/gerbview/epapertagjig-cam.GML
rename to PCB/gerbview/epapertagjig-cam.GML
diff --git a/PCB-jig/gerbview/epapertagjig-cam.GTL b/PCB/gerbview/epapertagjig-cam.GTL
similarity index 100%
rename from PCB-jig/gerbview/epapertagjig-cam.GTL
rename to PCB/gerbview/epapertagjig-cam.GTL
diff --git a/PCB-jig/gerbview/epapertagjig-cam.GTO b/PCB/gerbview/epapertagjig-cam.GTO
similarity index 100%
rename from PCB-jig/gerbview/epapertagjig-cam.GTO
rename to PCB/gerbview/epapertagjig-cam.GTO
diff --git a/PCB-jig/gerbview/epapertagjig-cam.GTP b/PCB/gerbview/epapertagjig-cam.GTP
similarity index 100%
rename from PCB-jig/gerbview/epapertagjig-cam.GTP
rename to PCB/gerbview/epapertagjig-cam.GTP
diff --git a/PCB-jig/gerbview/epapertagjig-cam.GTS b/PCB/gerbview/epapertagjig-cam.GTS
similarity index 100%
rename from PCB-jig/gerbview/epapertagjig-cam.GTS
rename to PCB/gerbview/epapertagjig-cam.GTS
diff --git a/PCB-jig/gerbview/epapertagjig-cam.TXT b/PCB/gerbview/epapertagjig-cam.TXT
similarity index 100%
rename from PCB-jig/gerbview/epapertagjig-cam.TXT
rename to PCB/gerbview/epapertagjig-cam.TXT
diff --git a/PCB-jig/gerbview/epapertagjig-cam.dri b/PCB/gerbview/epapertagjig-cam.dri
similarity index 100%
rename from PCB-jig/gerbview/epapertagjig-cam.dri
rename to PCB/gerbview/epapertagjig-cam.dri
diff --git a/PCB-jig/gerbview/epapertagjig-cam.gpi b/PCB/gerbview/epapertagjig-cam.gpi
similarity index 100%
rename from PCB-jig/gerbview/epapertagjig-cam.gpi
rename to PCB/gerbview/epapertagjig-cam.gpi
diff --git a/PCB-jig/gerbview/gerbv.exe b/PCB/gerbview/gerbv.exe
similarity index 100%
rename from PCB-jig/gerbview/gerbv.exe
rename to PCB/gerbview/gerbv.exe
diff --git a/PCB-jig/pcb-photo.jpg b/PCB/pcb-photo.jpg
similarity index 100%
rename from PCB-jig/pcb-photo.jpg
rename to PCB/pcb-photo.jpg
diff --git a/ap_fw/.gitignore b/zbs243_AP_FW/.gitignore
similarity index 100%
rename from ap_fw/.gitignore
rename to zbs243_AP_FW/.gitignore
diff --git a/ap_fw/LICENSE.txt b/zbs243_AP_FW/LICENSE.txt
similarity index 100%
rename from ap_fw/LICENSE.txt
rename to zbs243_AP_FW/LICENSE.txt
diff --git a/ap_fw/Makefile b/zbs243_AP_FW/Makefile
similarity index 100%
rename from ap_fw/Makefile
rename to zbs243_AP_FW/Makefile
diff --git a/ap_fw/adc.h b/zbs243_AP_FW/adc.h
similarity index 100%
rename from ap_fw/adc.h
rename to zbs243_AP_FW/adc.h
diff --git a/ap_fw/ap_fw.bin b/zbs243_AP_FW/ap_fw.bin
similarity index 100%
rename from ap_fw/ap_fw.bin
rename to zbs243_AP_FW/ap_fw.bin
diff --git a/ap_fw/asmUtil.h b/zbs243_AP_FW/asmUtil.h
similarity index 100%
rename from ap_fw/asmUtil.h
rename to zbs243_AP_FW/asmUtil.h
diff --git a/ap_fw/board/boardCommon.h b/zbs243_AP_FW/board/boardCommon.h
similarity index 100%
rename from ap_fw/board/boardCommon.h
rename to zbs243_AP_FW/board/boardCommon.h
diff --git a/ap_fw/board/boardZBS29common.c b/zbs243_AP_FW/board/boardZBS29common.c
similarity index 100%
rename from ap_fw/board/boardZBS29common.c
rename to zbs243_AP_FW/board/boardZBS29common.c
diff --git a/ap_fw/board/zbs29v033/board.c b/zbs243_AP_FW/board/zbs29v033/board.c
similarity index 100%
rename from ap_fw/board/zbs29v033/board.c
rename to zbs243_AP_FW/board/zbs29v033/board.c
diff --git a/ap_fw/board/zbs29v033/board.h b/zbs243_AP_FW/board/zbs29v033/board.h
similarity index 100%
rename from ap_fw/board/zbs29v033/board.h
rename to zbs243_AP_FW/board/zbs29v033/board.h
diff --git a/ap_fw/board/zbs29v033/make.mk b/zbs243_AP_FW/board/zbs29v033/make.mk
similarity index 100%
rename from ap_fw/board/zbs29v033/make.mk
rename to zbs243_AP_FW/board/zbs29v033/make.mk
diff --git a/ap_fw/board/zbs29v033/screen.h b/zbs243_AP_FW/board/zbs29v033/screen.h
similarity index 100%
rename from ap_fw/board/zbs29v033/screen.h
rename to zbs243_AP_FW/board/zbs29v033/screen.h
diff --git a/ap_fw/builder.php b/zbs243_AP_FW/builder.php
similarity index 100%
rename from ap_fw/builder.php
rename to zbs243_AP_FW/builder.php
diff --git a/ap_fw/comms.c b/zbs243_AP_FW/comms.c
similarity index 100%
rename from ap_fw/comms.c
rename to zbs243_AP_FW/comms.c
diff --git a/ap_fw/comms.h b/zbs243_AP_FW/comms.h
similarity index 100%
rename from ap_fw/comms.h
rename to zbs243_AP_FW/comms.h
diff --git a/ap_fw/cpu/8051/asmUtil.c b/zbs243_AP_FW/cpu/8051/asmUtil.c
similarity index 100%
rename from ap_fw/cpu/8051/asmUtil.c
rename to zbs243_AP_FW/cpu/8051/asmUtil.c
diff --git a/ap_fw/cpu/8051/cpu.c b/zbs243_AP_FW/cpu/8051/cpu.c
similarity index 100%
rename from ap_fw/cpu/8051/cpu.c
rename to zbs243_AP_FW/cpu/8051/cpu.c
diff --git a/ap_fw/cpu/8051/cpu.h b/zbs243_AP_FW/cpu/8051/cpu.h
similarity index 100%
rename from ap_fw/cpu/8051/cpu.h
rename to zbs243_AP_FW/cpu/8051/cpu.h
diff --git a/ap_fw/cpu/8051/make.mk b/zbs243_AP_FW/cpu/8051/make.mk
similarity index 100%
rename from ap_fw/cpu/8051/make.mk
rename to zbs243_AP_FW/cpu/8051/make.mk
diff --git a/ap_fw/cpu/8051/peep.def b/zbs243_AP_FW/cpu/8051/peep.def
similarity index 100%
rename from ap_fw/cpu/8051/peep.def
rename to zbs243_AP_FW/cpu/8051/peep.def
diff --git a/ap_fw/cpu/8051/printf.c b/zbs243_AP_FW/cpu/8051/printf.c
similarity index 100%
rename from ap_fw/cpu/8051/printf.c
rename to zbs243_AP_FW/cpu/8051/printf.c
diff --git a/ap_fw/cpu/8051/random.c b/zbs243_AP_FW/cpu/8051/random.c
similarity index 100%
rename from ap_fw/cpu/8051/random.c
rename to zbs243_AP_FW/cpu/8051/random.c
diff --git a/ap_fw/main.c b/zbs243_AP_FW/main.c
similarity index 100%
rename from ap_fw/main.c
rename to zbs243_AP_FW/main.c
diff --git a/ap_fw/make.bat b/zbs243_AP_FW/make.bat
similarity index 100%
rename from ap_fw/make.bat
rename to zbs243_AP_FW/make.bat
diff --git a/ap_fw/makeit.exe b/zbs243_AP_FW/makeit.exe
similarity index 100%
rename from ap_fw/makeit.exe
rename to zbs243_AP_FW/makeit.exe
diff --git a/ap_fw/printf.h b/zbs243_AP_FW/printf.h
similarity index 100%
rename from ap_fw/printf.h
rename to zbs243_AP_FW/printf.h
diff --git a/ap_fw/proto.h b/zbs243_AP_FW/proto.h
similarity index 100%
rename from ap_fw/proto.h
rename to zbs243_AP_FW/proto.h
diff --git a/ap_fw/soc/radioCommon.h b/zbs243_AP_FW/soc/radioCommon.h
similarity index 100%
rename from ap_fw/soc/radioCommon.h
rename to zbs243_AP_FW/soc/radioCommon.h
diff --git a/ap_fw/soc/zbs243/flash.c b/zbs243_AP_FW/soc/zbs243/flash.c
similarity index 100%
rename from ap_fw/soc/zbs243/flash.c
rename to zbs243_AP_FW/soc/zbs243/flash.c
diff --git a/ap_fw/soc/zbs243/flash.h b/zbs243_AP_FW/soc/zbs243/flash.h
similarity index 100%
rename from ap_fw/soc/zbs243/flash.h
rename to zbs243_AP_FW/soc/zbs243/flash.h
diff --git a/ap_fw/soc/zbs243/i2c.c b/zbs243_AP_FW/soc/zbs243/i2c.c
similarity index 100%
rename from ap_fw/soc/zbs243/i2c.c
rename to zbs243_AP_FW/soc/zbs243/i2c.c
diff --git a/ap_fw/soc/zbs243/i2c.h b/zbs243_AP_FW/soc/zbs243/i2c.h
similarity index 100%
rename from ap_fw/soc/zbs243/i2c.h
rename to zbs243_AP_FW/soc/zbs243/i2c.h
diff --git a/ap_fw/soc/zbs243/make.mk b/zbs243_AP_FW/soc/zbs243/make.mk
similarity index 100%
rename from ap_fw/soc/zbs243/make.mk
rename to zbs243_AP_FW/soc/zbs243/make.mk
diff --git a/ap_fw/soc/zbs243/radio.c b/zbs243_AP_FW/soc/zbs243/radio.c
similarity index 100%
rename from ap_fw/soc/zbs243/radio.c
rename to zbs243_AP_FW/soc/zbs243/radio.c
diff --git a/ap_fw/soc/zbs243/radio.h b/zbs243_AP_FW/soc/zbs243/radio.h
similarity index 100%
rename from ap_fw/soc/zbs243/radio.h
rename to zbs243_AP_FW/soc/zbs243/radio.h
diff --git a/ap_fw/soc/zbs243/sleep.c b/zbs243_AP_FW/soc/zbs243/sleep.c
similarity index 100%
rename from ap_fw/soc/zbs243/sleep.c
rename to zbs243_AP_FW/soc/zbs243/sleep.c
diff --git a/ap_fw/soc/zbs243/soc.c b/zbs243_AP_FW/soc/zbs243/soc.c
similarity index 100%
rename from ap_fw/soc/zbs243/soc.c
rename to zbs243_AP_FW/soc/zbs243/soc.c
diff --git a/ap_fw/soc/zbs243/soc.h b/zbs243_AP_FW/soc/zbs243/soc.h
similarity index 100%
rename from ap_fw/soc/zbs243/soc.h
rename to zbs243_AP_FW/soc/zbs243/soc.h
diff --git a/ap_fw/soc/zbs243/spi.c b/zbs243_AP_FW/soc/zbs243/spi.c
similarity index 100%
rename from ap_fw/soc/zbs243/spi.c
rename to zbs243_AP_FW/soc/zbs243/spi.c
diff --git a/ap_fw/soc/zbs243/spi.h b/zbs243_AP_FW/soc/zbs243/spi.h
similarity index 100%
rename from ap_fw/soc/zbs243/spi.h
rename to zbs243_AP_FW/soc/zbs243/spi.h
diff --git a/ap_fw/soc/zbs243/temperature.c b/zbs243_AP_FW/soc/zbs243/temperature.c
similarity index 100%
rename from ap_fw/soc/zbs243/temperature.c
rename to zbs243_AP_FW/soc/zbs243/temperature.c
diff --git a/ap_fw/soc/zbs243/timer.c b/zbs243_AP_FW/soc/zbs243/timer.c
similarity index 100%
rename from ap_fw/soc/zbs243/timer.c
rename to zbs243_AP_FW/soc/zbs243/timer.c
diff --git a/ap_fw/soc/zbs243/timer.h b/zbs243_AP_FW/soc/zbs243/timer.h
similarity index 100%
rename from ap_fw/soc/zbs243/timer.h
rename to zbs243_AP_FW/soc/zbs243/timer.h
diff --git a/ap_fw/soc/zbs243/uart.c b/zbs243_AP_FW/soc/zbs243/uart.c
similarity index 100%
rename from ap_fw/soc/zbs243/uart.c
rename to zbs243_AP_FW/soc/zbs243/uart.c
diff --git a/ap_fw/soc/zbs243/uart.h b/zbs243_AP_FW/soc/zbs243/uart.h
similarity index 100%
rename from ap_fw/soc/zbs243/uart.h
rename to zbs243_AP_FW/soc/zbs243/uart.h
diff --git a/ap_fw/soc/zbs243/wdt.c b/zbs243_AP_FW/soc/zbs243/wdt.c
similarity index 100%
rename from ap_fw/soc/zbs243/wdt.c
rename to zbs243_AP_FW/soc/zbs243/wdt.c
diff --git a/ap_fw/soc/zbs243/zbs243.h b/zbs243_AP_FW/soc/zbs243/zbs243.h
similarity index 100%
rename from ap_fw/soc/zbs243/zbs243.h
rename to zbs243_AP_FW/soc/zbs243/zbs243.h
diff --git a/ap_fw/wdt.h b/zbs243_AP_FW/wdt.h
similarity index 100%
rename from ap_fw/wdt.h
rename to zbs243_AP_FW/wdt.h
diff --git a/tag_fw/.gitignore b/zbs243_Tag_FW/.gitignore
similarity index 100%
rename from tag_fw/.gitignore
rename to zbs243_Tag_FW/.gitignore
diff --git a/tag_fw/LICENSE.txt b/zbs243_Tag_FW/LICENSE.txt
similarity index 100%
rename from tag_fw/LICENSE.txt
rename to zbs243_Tag_FW/LICENSE.txt
diff --git a/tag_fw/Makefile b/zbs243_Tag_FW/Makefile
similarity index 100%
rename from tag_fw/Makefile
rename to zbs243_Tag_FW/Makefile
diff --git a/tag_fw/asmUtil.h b/zbs243_Tag_FW/asmUtil.h
similarity index 100%
rename from tag_fw/asmUtil.h
rename to zbs243_Tag_FW/asmUtil.h
diff --git a/tag_fw/barcode.c b/zbs243_Tag_FW/barcode.c
similarity index 100%
rename from tag_fw/barcode.c
rename to zbs243_Tag_FW/barcode.c
diff --git a/tag_fw/barcode.h b/zbs243_Tag_FW/barcode.h
similarity index 100%
rename from tag_fw/barcode.h
rename to zbs243_Tag_FW/barcode.h
diff --git a/tag_fw/bitmaps.h b/zbs243_Tag_FW/bitmaps.h
similarity index 100%
rename from tag_fw/bitmaps.h
rename to zbs243_Tag_FW/bitmaps.h
diff --git a/tag_fw/board/boardCommon.h b/zbs243_Tag_FW/board/boardCommon.h
similarity index 100%
rename from tag_fw/board/boardCommon.h
rename to zbs243_Tag_FW/board/boardCommon.h
diff --git a/tag_fw/board/boardZBS29common.c b/zbs243_Tag_FW/board/boardZBS29common.c
similarity index 100%
rename from tag_fw/board/boardZBS29common.c
rename to zbs243_Tag_FW/board/boardZBS29common.c
diff --git a/tag_fw/board/ssd1619.c b/zbs243_Tag_FW/board/ssd1619.c
similarity index 100%
rename from tag_fw/board/ssd1619.c
rename to zbs243_Tag_FW/board/ssd1619.c
diff --git a/tag_fw/board/ssd1619.h b/zbs243_Tag_FW/board/ssd1619.h
similarity index 100%
rename from tag_fw/board/ssd1619.h
rename to zbs243_Tag_FW/board/ssd1619.h
diff --git a/tag_fw/board/uc8151.c b/zbs243_Tag_FW/board/uc8151.c
similarity index 100%
rename from tag_fw/board/uc8151.c
rename to zbs243_Tag_FW/board/uc8151.c
diff --git a/tag_fw/board/uc8151.h b/zbs243_Tag_FW/board/uc8151.h
similarity index 100%
rename from tag_fw/board/uc8151.h
rename to zbs243_Tag_FW/board/uc8151.h
diff --git a/tag_fw/board/zbs154v033/board.c b/zbs243_Tag_FW/board/zbs154v033/board.c
similarity index 100%
rename from tag_fw/board/zbs154v033/board.c
rename to zbs243_Tag_FW/board/zbs154v033/board.c
diff --git a/tag_fw/board/zbs154v033/board.h b/zbs243_Tag_FW/board/zbs154v033/board.h
similarity index 100%
rename from tag_fw/board/zbs154v033/board.h
rename to zbs243_Tag_FW/board/zbs154v033/board.h
diff --git a/tag_fw/board/zbs154v033/make.mk b/zbs243_Tag_FW/board/zbs154v033/make.mk
similarity index 100%
rename from tag_fw/board/zbs154v033/make.mk
rename to zbs243_Tag_FW/board/zbs154v033/make.mk
diff --git a/tag_fw/board/zbs154v033/screen.c b/zbs243_Tag_FW/board/zbs154v033/screen.c
similarity index 100%
rename from tag_fw/board/zbs154v033/screen.c
rename to zbs243_Tag_FW/board/zbs154v033/screen.c
diff --git a/tag_fw/board/zbs154v033/screen.h b/zbs243_Tag_FW/board/zbs154v033/screen.h
similarity index 100%
rename from tag_fw/board/zbs154v033/screen.h
rename to zbs243_Tag_FW/board/zbs154v033/screen.h
diff --git a/tag_fw/board/zbs29_uc8151/board.c b/zbs243_Tag_FW/board/zbs29_uc8151/board.c
similarity index 100%
rename from tag_fw/board/zbs29_uc8151/board.c
rename to zbs243_Tag_FW/board/zbs29_uc8151/board.c
diff --git a/tag_fw/board/zbs29_uc8151/board.h b/zbs243_Tag_FW/board/zbs29_uc8151/board.h
similarity index 100%
rename from tag_fw/board/zbs29_uc8151/board.h
rename to zbs243_Tag_FW/board/zbs29_uc8151/board.h
diff --git a/tag_fw/board/zbs29_uc8151/make.mk b/zbs243_Tag_FW/board/zbs29_uc8151/make.mk
similarity index 100%
rename from tag_fw/board/zbs29_uc8151/make.mk
rename to zbs243_Tag_FW/board/zbs29_uc8151/make.mk
diff --git a/tag_fw/board/zbs29_uc8151/screen.c b/zbs243_Tag_FW/board/zbs29_uc8151/screen.c
similarity index 100%
rename from tag_fw/board/zbs29_uc8151/screen.c
rename to zbs243_Tag_FW/board/zbs29_uc8151/screen.c
diff --git a/tag_fw/board/zbs29_uc8151/screen.h b/zbs243_Tag_FW/board/zbs29_uc8151/screen.h
similarity index 100%
rename from tag_fw/board/zbs29_uc8151/screen.h
rename to zbs243_Tag_FW/board/zbs29_uc8151/screen.h
diff --git a/tag_fw/board/zbs29v033/board.c b/zbs243_Tag_FW/board/zbs29v033/board.c
similarity index 100%
rename from tag_fw/board/zbs29v033/board.c
rename to zbs243_Tag_FW/board/zbs29v033/board.c
diff --git a/tag_fw/board/zbs29v033/board.h b/zbs243_Tag_FW/board/zbs29v033/board.h
similarity index 100%
rename from tag_fw/board/zbs29v033/board.h
rename to zbs243_Tag_FW/board/zbs29v033/board.h
diff --git a/tag_fw/board/zbs29v033/make.mk b/zbs243_Tag_FW/board/zbs29v033/make.mk
similarity index 100%
rename from tag_fw/board/zbs29v033/make.mk
rename to zbs243_Tag_FW/board/zbs29v033/make.mk
diff --git a/tag_fw/board/zbs29v033/screen.c b/zbs243_Tag_FW/board/zbs29v033/screen.c
similarity index 100%
rename from tag_fw/board/zbs29v033/screen.c
rename to zbs243_Tag_FW/board/zbs29v033/screen.c
diff --git a/tag_fw/board/zbs29v033/screen.h b/zbs243_Tag_FW/board/zbs29v033/screen.h
similarity index 100%
rename from tag_fw/board/zbs29v033/screen.h
rename to zbs243_Tag_FW/board/zbs29v033/screen.h
diff --git a/tag_fw/board/zbs42v033/board.c b/zbs243_Tag_FW/board/zbs42v033/board.c
similarity index 100%
rename from tag_fw/board/zbs42v033/board.c
rename to zbs243_Tag_FW/board/zbs42v033/board.c
diff --git a/tag_fw/board/zbs42v033/board.h b/zbs243_Tag_FW/board/zbs42v033/board.h
similarity index 100%
rename from tag_fw/board/zbs42v033/board.h
rename to zbs243_Tag_FW/board/zbs42v033/board.h
diff --git a/tag_fw/board/zbs42v033/make.mk b/zbs243_Tag_FW/board/zbs42v033/make.mk
similarity index 100%
rename from tag_fw/board/zbs42v033/make.mk
rename to zbs243_Tag_FW/board/zbs42v033/make.mk
diff --git a/tag_fw/board/zbs42v033/screen.c b/zbs243_Tag_FW/board/zbs42v033/screen.c
similarity index 100%
rename from tag_fw/board/zbs42v033/screen.c
rename to zbs243_Tag_FW/board/zbs42v033/screen.c
diff --git a/tag_fw/board/zbs42v033/screen.h b/zbs243_Tag_FW/board/zbs42v033/screen.h
similarity index 100%
rename from tag_fw/board/zbs42v033/screen.h
rename to zbs243_Tag_FW/board/zbs42v033/screen.h
diff --git a/tag_fw/builder.php b/zbs243_Tag_FW/builder.php
similarity index 100%
rename from tag_fw/builder.php
rename to zbs243_Tag_FW/builder.php
diff --git a/tag_fw/buildfw.sh b/zbs243_Tag_FW/buildfw.sh
similarity index 100%
rename from tag_fw/buildfw.sh
rename to zbs243_Tag_FW/buildfw.sh
diff --git a/tag_fw/comms.c b/zbs243_Tag_FW/comms.c
similarity index 100%
rename from tag_fw/comms.c
rename to zbs243_Tag_FW/comms.c
diff --git a/tag_fw/comms.h b/zbs243_Tag_FW/comms.h
similarity index 100%
rename from tag_fw/comms.h
rename to zbs243_Tag_FW/comms.h
diff --git a/tag_fw/cpu/8051/asmUtil.c b/zbs243_Tag_FW/cpu/8051/asmUtil.c
similarity index 100%
rename from tag_fw/cpu/8051/asmUtil.c
rename to zbs243_Tag_FW/cpu/8051/asmUtil.c
diff --git a/tag_fw/cpu/8051/cpu.c b/zbs243_Tag_FW/cpu/8051/cpu.c
similarity index 100%
rename from tag_fw/cpu/8051/cpu.c
rename to zbs243_Tag_FW/cpu/8051/cpu.c
diff --git a/tag_fw/cpu/8051/cpu.h b/zbs243_Tag_FW/cpu/8051/cpu.h
similarity index 100%
rename from tag_fw/cpu/8051/cpu.h
rename to zbs243_Tag_FW/cpu/8051/cpu.h
diff --git a/tag_fw/cpu/8051/make.mk b/zbs243_Tag_FW/cpu/8051/make.mk
similarity index 100%
rename from tag_fw/cpu/8051/make.mk
rename to zbs243_Tag_FW/cpu/8051/make.mk
diff --git a/tag_fw/cpu/8051/peep.def b/zbs243_Tag_FW/cpu/8051/peep.def
similarity index 100%
rename from tag_fw/cpu/8051/peep.def
rename to zbs243_Tag_FW/cpu/8051/peep.def
diff --git a/tag_fw/cpu/8051/printf.c b/zbs243_Tag_FW/cpu/8051/printf.c
similarity index 100%
rename from tag_fw/cpu/8051/printf.c
rename to zbs243_Tag_FW/cpu/8051/printf.c
diff --git a/tag_fw/cpu/8051/random.c b/zbs243_Tag_FW/cpu/8051/random.c
similarity index 100%
rename from tag_fw/cpu/8051/random.c
rename to zbs243_Tag_FW/cpu/8051/random.c
diff --git a/tag_fw/drawing.c b/zbs243_Tag_FW/drawing.c
similarity index 100%
rename from tag_fw/drawing.c
rename to zbs243_Tag_FW/drawing.c
diff --git a/tag_fw/drawing.h b/zbs243_Tag_FW/drawing.h
similarity index 100%
rename from tag_fw/drawing.h
rename to zbs243_Tag_FW/drawing.h
diff --git a/tag_fw/eeprom.c b/zbs243_Tag_FW/eeprom.c
similarity index 100%
rename from tag_fw/eeprom.c
rename to zbs243_Tag_FW/eeprom.c
diff --git a/tag_fw/eeprom.h b/zbs243_Tag_FW/eeprom.h
similarity index 100%
rename from tag_fw/eeprom.h
rename to zbs243_Tag_FW/eeprom.h
diff --git a/tag_fw/font.h b/zbs243_Tag_FW/font.h
similarity index 100%
rename from tag_fw/font.h
rename to zbs243_Tag_FW/font.h
diff --git a/tag_fw/fw154.bin b/zbs243_Tag_FW/fw154.bin
similarity index 100%
rename from tag_fw/fw154.bin
rename to zbs243_Tag_FW/fw154.bin
diff --git a/tag_fw/fw29-uc8151.bin b/zbs243_Tag_FW/fw29-uc8151.bin
similarity index 100%
rename from tag_fw/fw29-uc8151.bin
rename to zbs243_Tag_FW/fw29-uc8151.bin
diff --git a/tag_fw/fw29.bin b/zbs243_Tag_FW/fw29.bin
similarity index 100%
rename from tag_fw/fw29.bin
rename to zbs243_Tag_FW/fw29.bin
diff --git a/tag_fw/fw42.bin b/zbs243_Tag_FW/fw42.bin
similarity index 100%
rename from tag_fw/fw42.bin
rename to zbs243_Tag_FW/fw42.bin
diff --git a/tag_fw/i2cdevices.c b/zbs243_Tag_FW/i2cdevices.c
similarity index 100%
rename from tag_fw/i2cdevices.c
rename to zbs243_Tag_FW/i2cdevices.c
diff --git a/tag_fw/i2cdevices.h b/zbs243_Tag_FW/i2cdevices.h
similarity index 100%
rename from tag_fw/i2cdevices.h
rename to zbs243_Tag_FW/i2cdevices.h
diff --git a/tag_fw/lut.h b/zbs243_Tag_FW/lut.h
similarity index 100%
rename from tag_fw/lut.h
rename to zbs243_Tag_FW/lut.h
diff --git a/tag_fw/main.c b/zbs243_Tag_FW/main.c
similarity index 100%
rename from tag_fw/main.c
rename to zbs243_Tag_FW/main.c
diff --git a/tag_fw/main.map.old b/zbs243_Tag_FW/main.map.old
similarity index 100%
rename from tag_fw/main.map.old
rename to zbs243_Tag_FW/main.map.old
diff --git a/tag_fw/make.bat b/zbs243_Tag_FW/make.bat
similarity index 100%
rename from tag_fw/make.bat
rename to zbs243_Tag_FW/make.bat
diff --git a/tag_fw/makeit.exe b/zbs243_Tag_FW/makeit.exe
similarity index 100%
rename from tag_fw/makeit.exe
rename to zbs243_Tag_FW/makeit.exe
diff --git a/tag_fw/powermgt.c b/zbs243_Tag_FW/powermgt.c
similarity index 100%
rename from tag_fw/powermgt.c
rename to zbs243_Tag_FW/powermgt.c
diff --git a/tag_fw/powermgt.h b/zbs243_Tag_FW/powermgt.h
similarity index 100%
rename from tag_fw/powermgt.h
rename to zbs243_Tag_FW/powermgt.h
diff --git a/tag_fw/printf.h b/zbs243_Tag_FW/printf.h
similarity index 100%
rename from tag_fw/printf.h
rename to zbs243_Tag_FW/printf.h
diff --git a/tag_fw/proto.h b/zbs243_Tag_FW/proto.h
similarity index 100%
rename from tag_fw/proto.h
rename to zbs243_Tag_FW/proto.h
diff --git a/tag_fw/settings.h b/zbs243_Tag_FW/settings.h
similarity index 100%
rename from tag_fw/settings.h
rename to zbs243_Tag_FW/settings.h
diff --git a/tag_fw/sleep.h b/zbs243_Tag_FW/sleep.h
similarity index 100%
rename from tag_fw/sleep.h
rename to zbs243_Tag_FW/sleep.h
diff --git a/tag_fw/soc/radioCommon.h b/zbs243_Tag_FW/soc/radioCommon.h
similarity index 100%
rename from tag_fw/soc/radioCommon.h
rename to zbs243_Tag_FW/soc/radioCommon.h
diff --git a/tag_fw/soc/zbs243/flash.c b/zbs243_Tag_FW/soc/zbs243/flash.c
similarity index 100%
rename from tag_fw/soc/zbs243/flash.c
rename to zbs243_Tag_FW/soc/zbs243/flash.c
diff --git a/tag_fw/soc/zbs243/flash.h b/zbs243_Tag_FW/soc/zbs243/flash.h
similarity index 100%
rename from tag_fw/soc/zbs243/flash.h
rename to zbs243_Tag_FW/soc/zbs243/flash.h
diff --git a/tag_fw/soc/zbs243/i2c.c b/zbs243_Tag_FW/soc/zbs243/i2c.c
similarity index 100%
rename from tag_fw/soc/zbs243/i2c.c
rename to zbs243_Tag_FW/soc/zbs243/i2c.c
diff --git a/tag_fw/soc/zbs243/i2c.h b/zbs243_Tag_FW/soc/zbs243/i2c.h
similarity index 100%
rename from tag_fw/soc/zbs243/i2c.h
rename to zbs243_Tag_FW/soc/zbs243/i2c.h
diff --git a/tag_fw/soc/zbs243/make.mk b/zbs243_Tag_FW/soc/zbs243/make.mk
similarity index 100%
rename from tag_fw/soc/zbs243/make.mk
rename to zbs243_Tag_FW/soc/zbs243/make.mk
diff --git a/tag_fw/soc/zbs243/radio.c b/zbs243_Tag_FW/soc/zbs243/radio.c
similarity index 100%
rename from tag_fw/soc/zbs243/radio.c
rename to zbs243_Tag_FW/soc/zbs243/radio.c
diff --git a/tag_fw/soc/zbs243/radio.h b/zbs243_Tag_FW/soc/zbs243/radio.h
similarity index 100%
rename from tag_fw/soc/zbs243/radio.h
rename to zbs243_Tag_FW/soc/zbs243/radio.h
diff --git a/tag_fw/soc/zbs243/sleep.c b/zbs243_Tag_FW/soc/zbs243/sleep.c
similarity index 100%
rename from tag_fw/soc/zbs243/sleep.c
rename to zbs243_Tag_FW/soc/zbs243/sleep.c
diff --git a/tag_fw/soc/zbs243/soc.c b/zbs243_Tag_FW/soc/zbs243/soc.c
similarity index 100%
rename from tag_fw/soc/zbs243/soc.c
rename to zbs243_Tag_FW/soc/zbs243/soc.c
diff --git a/tag_fw/soc/zbs243/soc.h b/zbs243_Tag_FW/soc/zbs243/soc.h
similarity index 100%
rename from tag_fw/soc/zbs243/soc.h
rename to zbs243_Tag_FW/soc/zbs243/soc.h
diff --git a/tag_fw/soc/zbs243/spi.c b/zbs243_Tag_FW/soc/zbs243/spi.c
similarity index 100%
rename from tag_fw/soc/zbs243/spi.c
rename to zbs243_Tag_FW/soc/zbs243/spi.c
diff --git a/tag_fw/soc/zbs243/spi.h b/zbs243_Tag_FW/soc/zbs243/spi.h
similarity index 100%
rename from tag_fw/soc/zbs243/spi.h
rename to zbs243_Tag_FW/soc/zbs243/spi.h
diff --git a/tag_fw/soc/zbs243/temperature.c b/zbs243_Tag_FW/soc/zbs243/temperature.c
similarity index 100%
rename from tag_fw/soc/zbs243/temperature.c
rename to zbs243_Tag_FW/soc/zbs243/temperature.c
diff --git a/tag_fw/soc/zbs243/timer.c b/zbs243_Tag_FW/soc/zbs243/timer.c
similarity index 100%
rename from tag_fw/soc/zbs243/timer.c
rename to zbs243_Tag_FW/soc/zbs243/timer.c
diff --git a/tag_fw/soc/zbs243/timer.h b/zbs243_Tag_FW/soc/zbs243/timer.h
similarity index 100%
rename from tag_fw/soc/zbs243/timer.h
rename to zbs243_Tag_FW/soc/zbs243/timer.h
diff --git a/tag_fw/soc/zbs243/uart.c b/zbs243_Tag_FW/soc/zbs243/uart.c
similarity index 100%
rename from tag_fw/soc/zbs243/uart.c
rename to zbs243_Tag_FW/soc/zbs243/uart.c
diff --git a/tag_fw/soc/zbs243/uart.h b/zbs243_Tag_FW/soc/zbs243/uart.h
similarity index 100%
rename from tag_fw/soc/zbs243/uart.h
rename to zbs243_Tag_FW/soc/zbs243/uart.h
diff --git a/tag_fw/soc/zbs243/wdt.c b/zbs243_Tag_FW/soc/zbs243/wdt.c
similarity index 100%
rename from tag_fw/soc/zbs243/wdt.c
rename to zbs243_Tag_FW/soc/zbs243/wdt.c
diff --git a/tag_fw/soc/zbs243/zbs243.h b/zbs243_Tag_FW/soc/zbs243/zbs243.h
similarity index 100%
rename from tag_fw/soc/zbs243/zbs243.h
rename to zbs243_Tag_FW/soc/zbs243/zbs243.h
diff --git a/tag_fw/syncedproto.c b/zbs243_Tag_FW/syncedproto.c
similarity index 100%
rename from tag_fw/syncedproto.c
rename to zbs243_Tag_FW/syncedproto.c
diff --git a/tag_fw/syncedproto.h b/zbs243_Tag_FW/syncedproto.h
similarity index 100%
rename from tag_fw/syncedproto.h
rename to zbs243_Tag_FW/syncedproto.h
diff --git a/tag_fw/userinterface.c b/zbs243_Tag_FW/userinterface.c
similarity index 100%
rename from tag_fw/userinterface.c
rename to zbs243_Tag_FW/userinterface.c
diff --git a/tag_fw/userinterface.h b/zbs243_Tag_FW/userinterface.h
similarity index 100%
rename from tag_fw/userinterface.h
rename to zbs243_Tag_FW/userinterface.h
diff --git a/tag_fw/wdt.h b/zbs243_Tag_FW/wdt.h
similarity index 100%
rename from tag_fw/wdt.h
rename to zbs243_Tag_FW/wdt.h