diff --git a/macos/dfu-util/dfu-prefix b/macosx/dfu-util/dfu-prefix
similarity index 100%
rename from macos/dfu-util/dfu-prefix
rename to macosx/dfu-util/dfu-prefix
diff --git a/macos/dfu-util/dfu-suffix b/macosx/dfu-util/dfu-suffix
similarity index 100%
rename from macos/dfu-util/dfu-suffix
rename to macosx/dfu-util/dfu-suffix
diff --git a/macos/dfu-util/dfu-util b/macosx/dfu-util/dfu-util
similarity index 100%
rename from macos/dfu-util/dfu-util
rename to macosx/dfu-util/dfu-util
diff --git a/macos/maple_upload b/macosx/maple_upload
similarity index 100%
rename from macos/maple_upload
rename to macosx/maple_upload
diff --git a/macos/nucleoFlasher/nucleoFlasherMacOsX b/macosx/nucleoFlasher/nucleoFlasherMacOsX
similarity index 100%
rename from macos/nucleoFlasher/nucleoFlasherMacOsX
rename to macosx/nucleoFlasher/nucleoFlasherMacOsX
diff --git a/macos/nucleoFlasher/nucleoFlasherMacOsX.c b/macosx/nucleoFlasher/nucleoFlasherMacOsX.c
similarity index 100%
rename from macos/nucleoFlasher/nucleoFlasherMacOsX.c
rename to macosx/nucleoFlasher/nucleoFlasherMacOsX.c
diff --git a/macos/serial_upload b/macosx/serial_upload
similarity index 100%
rename from macos/serial_upload
rename to macosx/serial_upload
diff --git a/macos/src/build_dfu-util.sh b/macosx/src/build_dfu-util.sh
similarity index 100%
rename from macos/src/build_dfu-util.sh
rename to macosx/src/build_dfu-util.sh
diff --git a/macos/src/dfu-util/AUTHORS b/macosx/src/dfu-util/AUTHORS
similarity index 100%
rename from macos/src/dfu-util/AUTHORS
rename to macosx/src/dfu-util/AUTHORS
diff --git a/macos/src/dfu-util/COPYING b/macosx/src/dfu-util/COPYING
similarity index 100%
rename from macos/src/dfu-util/COPYING
rename to macosx/src/dfu-util/COPYING
diff --git a/macos/src/dfu-util/ChangeLog b/macosx/src/dfu-util/ChangeLog
similarity index 100%
rename from macos/src/dfu-util/ChangeLog
rename to macosx/src/dfu-util/ChangeLog
diff --git a/macos/src/dfu-util/DEVICES.txt b/macosx/src/dfu-util/DEVICES.txt
similarity index 100%
rename from macos/src/dfu-util/DEVICES.txt
rename to macosx/src/dfu-util/DEVICES.txt
diff --git a/macos/src/dfu-util/Makefile.am b/macosx/src/dfu-util/Makefile.am
similarity index 100%
rename from macos/src/dfu-util/Makefile.am
rename to macosx/src/dfu-util/Makefile.am
diff --git a/macos/src/dfu-util/README b/macosx/src/dfu-util/README
similarity index 100%
rename from macos/src/dfu-util/README
rename to macosx/src/dfu-util/README
diff --git a/macos/src/dfu-util/TODO b/macosx/src/dfu-util/TODO
similarity index 100%
rename from macos/src/dfu-util/TODO
rename to macosx/src/dfu-util/TODO
diff --git a/macos/src/dfu-util/autogen.sh b/macosx/src/dfu-util/autogen.sh
similarity index 100%
rename from macos/src/dfu-util/autogen.sh
rename to macosx/src/dfu-util/autogen.sh
diff --git a/macos/src/dfu-util/configure.ac b/macosx/src/dfu-util/configure.ac
similarity index 100%
rename from macos/src/dfu-util/configure.ac
rename to macosx/src/dfu-util/configure.ac
diff --git a/macos/src/dfu-util/device-logs/README b/macosx/src/dfu-util/device-logs/README
similarity index 100%
rename from macos/src/dfu-util/device-logs/README
rename to macosx/src/dfu-util/device-logs/README
diff --git a/macos/src/dfu-util/device-logs/dsonano.lsusb b/macosx/src/dfu-util/device-logs/dsonano.lsusb
similarity index 100%
rename from macos/src/dfu-util/device-logs/dsonano.lsusb
rename to macosx/src/dfu-util/device-logs/dsonano.lsusb
diff --git a/macos/src/dfu-util/device-logs/lpclink.log b/macosx/src/dfu-util/device-logs/lpclink.log
similarity index 100%
rename from macos/src/dfu-util/device-logs/lpclink.log
rename to macosx/src/dfu-util/device-logs/lpclink.log
diff --git a/macos/src/dfu-util/device-logs/lpclink.lsusb b/macosx/src/dfu-util/device-logs/lpclink.lsusb
similarity index 100%
rename from macos/src/dfu-util/device-logs/lpclink.lsusb
rename to macosx/src/dfu-util/device-logs/lpclink.lsusb
diff --git a/macos/src/dfu-util/device-logs/lpclink2.log b/macosx/src/dfu-util/device-logs/lpclink2.log
similarity index 100%
rename from macos/src/dfu-util/device-logs/lpclink2.log
rename to macosx/src/dfu-util/device-logs/lpclink2.log
diff --git a/macos/src/dfu-util/device-logs/lpclink2.lsusb b/macosx/src/dfu-util/device-logs/lpclink2.lsusb
similarity index 100%
rename from macos/src/dfu-util/device-logs/lpclink2.lsusb
rename to macosx/src/dfu-util/device-logs/lpclink2.lsusb
diff --git a/macos/src/dfu-util/device-logs/opc-20.lsusb b/macosx/src/dfu-util/device-logs/opc-20.lsusb
similarity index 100%
rename from macos/src/dfu-util/device-logs/opc-20.lsusb
rename to macosx/src/dfu-util/device-logs/opc-20.lsusb
diff --git a/macos/src/dfu-util/device-logs/openmoko-freerunner-dfumode.lsusb b/macosx/src/dfu-util/device-logs/openmoko-freerunner-dfumode.lsusb
similarity index 100%
rename from macos/src/dfu-util/device-logs/openmoko-freerunner-dfumode.lsusb
rename to macosx/src/dfu-util/device-logs/openmoko-freerunner-dfumode.lsusb
diff --git a/macos/src/dfu-util/device-logs/openmoko-freerunner.lsusb b/macosx/src/dfu-util/device-logs/openmoko-freerunner.lsusb
similarity index 100%
rename from macos/src/dfu-util/device-logs/openmoko-freerunner.lsusb
rename to macosx/src/dfu-util/device-logs/openmoko-freerunner.lsusb
diff --git a/macos/src/dfu-util/device-logs/openmoko-neo1973.lsusb b/macosx/src/dfu-util/device-logs/openmoko-neo1973.lsusb
similarity index 100%
rename from macos/src/dfu-util/device-logs/openmoko-neo1973.lsusb
rename to macosx/src/dfu-util/device-logs/openmoko-neo1973.lsusb
diff --git a/macos/src/dfu-util/device-logs/openpcd.lsusb b/macosx/src/dfu-util/device-logs/openpcd.lsusb
similarity index 100%
rename from macos/src/dfu-util/device-logs/openpcd.lsusb
rename to macosx/src/dfu-util/device-logs/openpcd.lsusb
diff --git a/macos/src/dfu-util/device-logs/qi-hardware-atusb.lsusb b/macosx/src/dfu-util/device-logs/qi-hardware-atusb.lsusb
similarity index 100%
rename from macos/src/dfu-util/device-logs/qi-hardware-atusb.lsusb
rename to macosx/src/dfu-util/device-logs/qi-hardware-atusb.lsusb
diff --git a/macos/src/dfu-util/device-logs/simtrace.lsusb b/macosx/src/dfu-util/device-logs/simtrace.lsusb
similarity index 100%
rename from macos/src/dfu-util/device-logs/simtrace.lsusb
rename to macosx/src/dfu-util/device-logs/simtrace.lsusb
diff --git a/macos/src/dfu-util/device-logs/sparkcore.lsusb b/macosx/src/dfu-util/device-logs/sparkcore.lsusb
similarity index 100%
rename from macos/src/dfu-util/device-logs/sparkcore.lsusb
rename to macosx/src/dfu-util/device-logs/sparkcore.lsusb
diff --git a/macos/src/dfu-util/device-logs/stm32f107.bin-download b/macosx/src/dfu-util/device-logs/stm32f107.bin-download
similarity index 100%
rename from macos/src/dfu-util/device-logs/stm32f107.bin-download
rename to macosx/src/dfu-util/device-logs/stm32f107.bin-download
diff --git a/macos/src/dfu-util/device-logs/stm32f107.lsusb b/macosx/src/dfu-util/device-logs/stm32f107.lsusb
similarity index 100%
rename from macos/src/dfu-util/device-logs/stm32f107.lsusb
rename to macosx/src/dfu-util/device-logs/stm32f107.lsusb
diff --git a/macos/src/dfu-util/device-logs/stm32f4discovery.bin-download b/macosx/src/dfu-util/device-logs/stm32f4discovery.bin-download
similarity index 100%
rename from macos/src/dfu-util/device-logs/stm32f4discovery.bin-download
rename to macosx/src/dfu-util/device-logs/stm32f4discovery.bin-download
diff --git a/macos/src/dfu-util/device-logs/stm32f4discovery.lsusb b/macosx/src/dfu-util/device-logs/stm32f4discovery.lsusb
similarity index 100%
rename from macos/src/dfu-util/device-logs/stm32f4discovery.lsusb
rename to macosx/src/dfu-util/device-logs/stm32f4discovery.lsusb
diff --git a/macos/src/dfu-util/device-logs/tdk-bluetooth.lsusb b/macosx/src/dfu-util/device-logs/tdk-bluetooth.lsusb
similarity index 100%
rename from macos/src/dfu-util/device-logs/tdk-bluetooth.lsusb
rename to macosx/src/dfu-util/device-logs/tdk-bluetooth.lsusb
diff --git a/macos/src/dfu-util/dfuse-pack.py b/macosx/src/dfu-util/dfuse-pack.py
similarity index 100%
rename from macos/src/dfu-util/dfuse-pack.py
rename to macosx/src/dfu-util/dfuse-pack.py
diff --git a/macos/src/dfu-util/doc/40-dfuse.rules b/macosx/src/dfu-util/doc/40-dfuse.rules
similarity index 100%
rename from macos/src/dfu-util/doc/40-dfuse.rules
rename to macosx/src/dfu-util/doc/40-dfuse.rules
diff --git a/macos/src/dfu-util/doc/Makefile.am b/macosx/src/dfu-util/doc/Makefile.am
similarity index 100%
rename from macos/src/dfu-util/doc/Makefile.am
rename to macosx/src/dfu-util/doc/Makefile.am
diff --git a/macos/src/dfu-util/doc/SPEC-differences.txt b/macosx/src/dfu-util/doc/SPEC-differences.txt
similarity index 100%
rename from macos/src/dfu-util/doc/SPEC-differences.txt
rename to macosx/src/dfu-util/doc/SPEC-differences.txt
diff --git a/macos/src/dfu-util/doc/dfu-util.1 b/macosx/src/dfu-util/doc/dfu-util.1
similarity index 100%
rename from macos/src/dfu-util/doc/dfu-util.1
rename to macosx/src/dfu-util/doc/dfu-util.1
diff --git a/macos/src/dfu-util/msvc/README_msvc.txt b/macosx/src/dfu-util/msvc/README_msvc.txt
similarity index 100%
rename from macos/src/dfu-util/msvc/README_msvc.txt
rename to macosx/src/dfu-util/msvc/README_msvc.txt
diff --git a/macos/src/dfu-util/msvc/dfu-suffix_2010.vcxproj b/macosx/src/dfu-util/msvc/dfu-suffix_2010.vcxproj
similarity index 100%
rename from macos/src/dfu-util/msvc/dfu-suffix_2010.vcxproj
rename to macosx/src/dfu-util/msvc/dfu-suffix_2010.vcxproj
diff --git a/macos/src/dfu-util/msvc/dfu-util_2010.sln b/macosx/src/dfu-util/msvc/dfu-util_2010.sln
similarity index 100%
rename from macos/src/dfu-util/msvc/dfu-util_2010.sln
rename to macosx/src/dfu-util/msvc/dfu-util_2010.sln
diff --git a/macos/src/dfu-util/msvc/dfu-util_2010.vcxproj b/macosx/src/dfu-util/msvc/dfu-util_2010.vcxproj
similarity index 100%
rename from macos/src/dfu-util/msvc/dfu-util_2010.vcxproj
rename to macosx/src/dfu-util/msvc/dfu-util_2010.vcxproj
diff --git a/macos/src/dfu-util/src/Makefile.am b/macosx/src/dfu-util/src/Makefile.am
similarity index 100%
rename from macos/src/dfu-util/src/Makefile.am
rename to macosx/src/dfu-util/src/Makefile.am
diff --git a/macos/src/dfu-util/src/dfu.c b/macosx/src/dfu-util/src/dfu.c
similarity index 100%
rename from macos/src/dfu-util/src/dfu.c
rename to macosx/src/dfu-util/src/dfu.c
diff --git a/macos/src/dfu-util/src/dfu.h b/macosx/src/dfu-util/src/dfu.h
similarity index 100%
rename from macos/src/dfu-util/src/dfu.h
rename to macosx/src/dfu-util/src/dfu.h
diff --git a/macos/src/dfu-util/src/dfu_file.c b/macosx/src/dfu-util/src/dfu_file.c
similarity index 100%
rename from macos/src/dfu-util/src/dfu_file.c
rename to macosx/src/dfu-util/src/dfu_file.c
diff --git a/macos/src/dfu-util/src/dfu_file.h b/macosx/src/dfu-util/src/dfu_file.h
similarity index 100%
rename from macos/src/dfu-util/src/dfu_file.h
rename to macosx/src/dfu-util/src/dfu_file.h
diff --git a/macos/src/dfu-util/src/dfu_load.c b/macosx/src/dfu-util/src/dfu_load.c
similarity index 100%
rename from macos/src/dfu-util/src/dfu_load.c
rename to macosx/src/dfu-util/src/dfu_load.c
diff --git a/macos/src/dfu-util/src/dfu_load.h b/macosx/src/dfu-util/src/dfu_load.h
similarity index 100%
rename from macos/src/dfu-util/src/dfu_load.h
rename to macosx/src/dfu-util/src/dfu_load.h
diff --git a/macos/src/dfu-util/src/dfu_util.c b/macosx/src/dfu-util/src/dfu_util.c
similarity index 100%
rename from macos/src/dfu-util/src/dfu_util.c
rename to macosx/src/dfu-util/src/dfu_util.c
diff --git a/macos/src/dfu-util/src/dfu_util.h b/macosx/src/dfu-util/src/dfu_util.h
similarity index 100%
rename from macos/src/dfu-util/src/dfu_util.h
rename to macosx/src/dfu-util/src/dfu_util.h
diff --git a/macos/src/dfu-util/src/dfuse.c b/macosx/src/dfu-util/src/dfuse.c
similarity index 100%
rename from macos/src/dfu-util/src/dfuse.c
rename to macosx/src/dfu-util/src/dfuse.c
diff --git a/macos/src/dfu-util/src/dfuse.h b/macosx/src/dfu-util/src/dfuse.h
similarity index 100%
rename from macos/src/dfu-util/src/dfuse.h
rename to macosx/src/dfu-util/src/dfuse.h
diff --git a/macos/src/dfu-util/src/dfuse_mem.c b/macosx/src/dfu-util/src/dfuse_mem.c
similarity index 100%
rename from macos/src/dfu-util/src/dfuse_mem.c
rename to macosx/src/dfu-util/src/dfuse_mem.c
diff --git a/macos/src/dfu-util/src/dfuse_mem.h b/macosx/src/dfu-util/src/dfuse_mem.h
similarity index 100%
rename from macos/src/dfu-util/src/dfuse_mem.h
rename to macosx/src/dfu-util/src/dfuse_mem.h
diff --git a/macos/src/dfu-util/src/main.c b/macosx/src/dfu-util/src/main.c
similarity index 100%
rename from macos/src/dfu-util/src/main.c
rename to macosx/src/dfu-util/src/main.c
diff --git a/macos/src/dfu-util/src/portable.h b/macosx/src/dfu-util/src/portable.h
similarity index 100%
rename from macos/src/dfu-util/src/portable.h
rename to macosx/src/dfu-util/src/portable.h
diff --git a/macos/src/dfu-util/src/prefix.c b/macosx/src/dfu-util/src/prefix.c
similarity index 100%
rename from macos/src/dfu-util/src/prefix.c
rename to macosx/src/dfu-util/src/prefix.c
diff --git a/macos/src/dfu-util/src/quirks.c b/macosx/src/dfu-util/src/quirks.c
similarity index 100%
rename from macos/src/dfu-util/src/quirks.c
rename to macosx/src/dfu-util/src/quirks.c
diff --git a/macos/src/dfu-util/src/quirks.h b/macosx/src/dfu-util/src/quirks.h
similarity index 100%
rename from macos/src/dfu-util/src/quirks.h
rename to macosx/src/dfu-util/src/quirks.h
diff --git a/macos/src/dfu-util/src/suffix.c b/macosx/src/dfu-util/src/suffix.c
similarity index 100%
rename from macos/src/dfu-util/src/suffix.c
rename to macosx/src/dfu-util/src/suffix.c
diff --git a/macos/src/dfu-util/src/usb_dfu.h b/macosx/src/dfu-util/src/usb_dfu.h
similarity index 100%
rename from macos/src/dfu-util/src/usb_dfu.h
rename to macosx/src/dfu-util/src/usb_dfu.h
diff --git a/macos/src/dfu-util/www/build.html b/macosx/src/dfu-util/www/build.html
similarity index 100%
rename from macos/src/dfu-util/www/build.html
rename to macosx/src/dfu-util/www/build.html
diff --git a/macos/src/dfu-util/www/dfu-util.1.html b/macosx/src/dfu-util/www/dfu-util.1.html
similarity index 100%
rename from macos/src/dfu-util/www/dfu-util.1.html
rename to macosx/src/dfu-util/www/dfu-util.1.html
diff --git a/macos/src/dfu-util/www/dfuse.html b/macosx/src/dfu-util/www/dfuse.html
similarity index 100%
rename from macos/src/dfu-util/www/dfuse.html
rename to macosx/src/dfu-util/www/dfuse.html
diff --git a/macos/src/dfu-util/www/index.html b/macosx/src/dfu-util/www/index.html
similarity index 100%
rename from macos/src/dfu-util/www/index.html
rename to macosx/src/dfu-util/www/index.html
diff --git a/macos/src/dfu-util/www/simple.css b/macosx/src/dfu-util/www/simple.css
similarity index 100%
rename from macos/src/dfu-util/www/simple.css
rename to macosx/src/dfu-util/www/simple.css
diff --git a/macos/src/maple_loader/README.md b/macosx/src/maple_loader/README.md
similarity index 100%
rename from macos/src/maple_loader/README.md
rename to macosx/src/maple_loader/README.md
diff --git a/macos/src/maple_loader/build.xml b/macosx/src/maple_loader/build.xml
similarity index 100%
rename from macos/src/maple_loader/build.xml
rename to macosx/src/maple_loader/build.xml
diff --git a/macos/src/maple_loader/build/built-jar.properties b/macosx/src/maple_loader/build/built-jar.properties
similarity index 100%
rename from macos/src/maple_loader/build/built-jar.properties
rename to macosx/src/maple_loader/build/built-jar.properties
diff --git a/macos/src/maple_loader/build/classes/CliTemplate/CliMain.class b/macosx/src/maple_loader/build/classes/CliTemplate/CliMain.class
similarity index 100%
rename from macos/src/maple_loader/build/classes/CliTemplate/CliMain.class
rename to macosx/src/maple_loader/build/classes/CliTemplate/CliMain.class
diff --git a/macos/src/maple_loader/build/classes/CliTemplate/DFUUploader.class b/macosx/src/maple_loader/build/classes/CliTemplate/DFUUploader.class
similarity index 100%
rename from macos/src/maple_loader/build/classes/CliTemplate/DFUUploader.class
rename to macosx/src/maple_loader/build/classes/CliTemplate/DFUUploader.class
diff --git a/macos/src/maple_loader/build/classes/CliTemplate/ExecCommand.class b/macosx/src/maple_loader/build/classes/CliTemplate/ExecCommand.class
similarity index 100%
rename from macos/src/maple_loader/build/classes/CliTemplate/ExecCommand.class
rename to macosx/src/maple_loader/build/classes/CliTemplate/ExecCommand.class
diff --git a/macos/src/maple_loader/build/classes/processing/app/Base.class b/macosx/src/maple_loader/build/classes/processing/app/Base.class
similarity index 100%
rename from macos/src/maple_loader/build/classes/processing/app/Base.class
rename to macosx/src/maple_loader/build/classes/processing/app/Base.class
diff --git a/macos/src/maple_loader/build/classes/processing/app/Preferences.class b/macosx/src/maple_loader/build/classes/processing/app/Preferences.class
similarity index 100%
rename from macos/src/maple_loader/build/classes/processing/app/Preferences.class
rename to macosx/src/maple_loader/build/classes/processing/app/Preferences.class
diff --git a/macos/src/maple_loader/build/classes/processing/app/Serial.class b/macosx/src/maple_loader/build/classes/processing/app/Serial.class
similarity index 100%
rename from macos/src/maple_loader/build/classes/processing/app/Serial.class
rename to macosx/src/maple_loader/build/classes/processing/app/Serial.class
diff --git a/macos/src/maple_loader/build/classes/processing/app/SerialException.class b/macosx/src/maple_loader/build/classes/processing/app/SerialException.class
similarity index 100%
rename from macos/src/maple_loader/build/classes/processing/app/SerialException.class
rename to macosx/src/maple_loader/build/classes/processing/app/SerialException.class
diff --git a/macos/src/maple_loader/build/classes/processing/app/debug/MessageConsumer.class b/macosx/src/maple_loader/build/classes/processing/app/debug/MessageConsumer.class
similarity index 100%
rename from macos/src/maple_loader/build/classes/processing/app/debug/MessageConsumer.class
rename to macosx/src/maple_loader/build/classes/processing/app/debug/MessageConsumer.class
diff --git a/macos/src/maple_loader/build/classes/processing/app/debug/MessageSiphon.class b/macosx/src/maple_loader/build/classes/processing/app/debug/MessageSiphon.class
similarity index 100%
rename from macos/src/maple_loader/build/classes/processing/app/debug/MessageSiphon.class
rename to macosx/src/maple_loader/build/classes/processing/app/debug/MessageSiphon.class
diff --git a/macos/src/maple_loader/build/classes/processing/app/debug/RunnerException.class b/macosx/src/maple_loader/build/classes/processing/app/debug/RunnerException.class
similarity index 100%
rename from macos/src/maple_loader/build/classes/processing/app/debug/RunnerException.class
rename to macosx/src/maple_loader/build/classes/processing/app/debug/RunnerException.class
diff --git a/macos/src/maple_loader/build/classes/processing/app/helpers/ProcessUtils.class b/macosx/src/maple_loader/build/classes/processing/app/helpers/ProcessUtils.class
similarity index 100%
rename from macos/src/maple_loader/build/classes/processing/app/helpers/ProcessUtils.class
rename to macosx/src/maple_loader/build/classes/processing/app/helpers/ProcessUtils.class
diff --git a/macos/src/maple_loader/dist/README.TXT b/macosx/src/maple_loader/dist/README.TXT
similarity index 100%
rename from macos/src/maple_loader/dist/README.TXT
rename to macosx/src/maple_loader/dist/README.TXT
diff --git a/macos/src/maple_loader/dist/lib/jssc.jar b/macosx/src/maple_loader/dist/lib/jssc.jar
similarity index 100%
rename from macos/src/maple_loader/dist/lib/jssc.jar
rename to macosx/src/maple_loader/dist/lib/jssc.jar
diff --git a/macos/src/maple_loader/dist/maple_loader.jar b/macosx/src/maple_loader/dist/maple_loader.jar
similarity index 100%
rename from macos/src/maple_loader/dist/maple_loader.jar
rename to macosx/src/maple_loader/dist/maple_loader.jar
diff --git a/macos/src/maple_loader/jars/jssc.jar b/macosx/src/maple_loader/jars/jssc.jar
similarity index 100%
rename from macos/src/maple_loader/jars/jssc.jar
rename to macosx/src/maple_loader/jars/jssc.jar
diff --git a/macos/src/maple_loader/manifest.mf b/macosx/src/maple_loader/manifest.mf
similarity index 100%
rename from macos/src/maple_loader/manifest.mf
rename to macosx/src/maple_loader/manifest.mf
diff --git a/macos/src/maple_loader/nbproject/build-impl.xml b/macosx/src/maple_loader/nbproject/build-impl.xml
similarity index 100%
rename from macos/src/maple_loader/nbproject/build-impl.xml
rename to macosx/src/maple_loader/nbproject/build-impl.xml
diff --git a/macos/src/maple_loader/nbproject/genfiles.properties b/macosx/src/maple_loader/nbproject/genfiles.properties
similarity index 100%
rename from macos/src/maple_loader/nbproject/genfiles.properties
rename to macosx/src/maple_loader/nbproject/genfiles.properties
diff --git a/macos/src/maple_loader/nbproject/private/config.properties b/macosx/src/maple_loader/nbproject/private/config.properties
similarity index 100%
rename from macos/src/maple_loader/nbproject/private/config.properties
rename to macosx/src/maple_loader/nbproject/private/config.properties
diff --git a/macos/src/maple_loader/nbproject/private/private.properties b/macosx/src/maple_loader/nbproject/private/private.properties
similarity index 100%
rename from macos/src/maple_loader/nbproject/private/private.properties
rename to macosx/src/maple_loader/nbproject/private/private.properties
diff --git a/macos/src/maple_loader/nbproject/private/private.xml b/macosx/src/maple_loader/nbproject/private/private.xml
similarity index 100%
rename from macos/src/maple_loader/nbproject/private/private.xml
rename to macosx/src/maple_loader/nbproject/private/private.xml
diff --git a/macos/src/maple_loader/nbproject/project.properties b/macosx/src/maple_loader/nbproject/project.properties
similarity index 100%
rename from macos/src/maple_loader/nbproject/project.properties
rename to macosx/src/maple_loader/nbproject/project.properties
diff --git a/macos/src/maple_loader/nbproject/project.xml b/macosx/src/maple_loader/nbproject/project.xml
similarity index 100%
rename from macos/src/maple_loader/nbproject/project.xml
rename to macosx/src/maple_loader/nbproject/project.xml
diff --git a/macos/src/maple_loader/src/CliTemplate/CliMain.java b/macosx/src/maple_loader/src/CliTemplate/CliMain.java
similarity index 100%
rename from macos/src/maple_loader/src/CliTemplate/CliMain.java
rename to macosx/src/maple_loader/src/CliTemplate/CliMain.java
diff --git a/macos/src/maple_loader/src/CliTemplate/DFUUploader.java b/macosx/src/maple_loader/src/CliTemplate/DFUUploader.java
similarity index 100%
rename from macos/src/maple_loader/src/CliTemplate/DFUUploader.java
rename to macosx/src/maple_loader/src/CliTemplate/DFUUploader.java
diff --git a/macos/src/maple_loader/src/CliTemplate/ExecCommand.java b/macosx/src/maple_loader/src/CliTemplate/ExecCommand.java
similarity index 100%
rename from macos/src/maple_loader/src/CliTemplate/ExecCommand.java
rename to macosx/src/maple_loader/src/CliTemplate/ExecCommand.java
diff --git a/macos/src/maple_loader/src/processing/app/Base.java b/macosx/src/maple_loader/src/processing/app/Base.java
similarity index 100%
rename from macos/src/maple_loader/src/processing/app/Base.java
rename to macosx/src/maple_loader/src/processing/app/Base.java
diff --git a/macos/src/maple_loader/src/processing/app/Preferences.java b/macosx/src/maple_loader/src/processing/app/Preferences.java
similarity index 100%
rename from macos/src/maple_loader/src/processing/app/Preferences.java
rename to macosx/src/maple_loader/src/processing/app/Preferences.java
diff --git a/macos/src/maple_loader/src/processing/app/Serial.java b/macosx/src/maple_loader/src/processing/app/Serial.java
similarity index 100%
rename from macos/src/maple_loader/src/processing/app/Serial.java
rename to macosx/src/maple_loader/src/processing/app/Serial.java
diff --git a/macos/src/maple_loader/src/processing/app/SerialException.java b/macosx/src/maple_loader/src/processing/app/SerialException.java
similarity index 100%
rename from macos/src/maple_loader/src/processing/app/SerialException.java
rename to macosx/src/maple_loader/src/processing/app/SerialException.java
diff --git a/macos/src/maple_loader/src/processing/app/debug/MessageConsumer.java b/macosx/src/maple_loader/src/processing/app/debug/MessageConsumer.java
similarity index 100%
rename from macos/src/maple_loader/src/processing/app/debug/MessageConsumer.java
rename to macosx/src/maple_loader/src/processing/app/debug/MessageConsumer.java
diff --git a/macos/src/maple_loader/src/processing/app/debug/MessageSiphon.java b/macosx/src/maple_loader/src/processing/app/debug/MessageSiphon.java
similarity index 100%
rename from macos/src/maple_loader/src/processing/app/debug/MessageSiphon.java
rename to macosx/src/maple_loader/src/processing/app/debug/MessageSiphon.java
diff --git a/macos/src/maple_loader/src/processing/app/debug/RunnerException.java b/macosx/src/maple_loader/src/processing/app/debug/RunnerException.java
similarity index 100%
rename from macos/src/maple_loader/src/processing/app/debug/RunnerException.java
rename to macosx/src/maple_loader/src/processing/app/debug/RunnerException.java
diff --git a/macos/src/maple_loader/src/processing/app/helpers/ProcessUtils.java b/macosx/src/maple_loader/src/processing/app/helpers/ProcessUtils.java
similarity index 100%
rename from macos/src/maple_loader/src/processing/app/helpers/ProcessUtils.java
rename to macosx/src/maple_loader/src/processing/app/helpers/ProcessUtils.java
diff --git a/macos/src/stm32flash_serial/src/AUTHORS b/macosx/src/stm32flash_serial/src/AUTHORS
similarity index 100%
rename from macos/src/stm32flash_serial/src/AUTHORS
rename to macosx/src/stm32flash_serial/src/AUTHORS
diff --git a/macos/src/stm32flash_serial/src/Android.mk b/macosx/src/stm32flash_serial/src/Android.mk
similarity index 100%
rename from macos/src/stm32flash_serial/src/Android.mk
rename to macosx/src/stm32flash_serial/src/Android.mk
diff --git a/macos/src/stm32flash_serial/src/HOWTO b/macosx/src/stm32flash_serial/src/HOWTO
similarity index 100%
rename from macos/src/stm32flash_serial/src/HOWTO
rename to macosx/src/stm32flash_serial/src/HOWTO
diff --git a/macos/src/stm32flash_serial/src/I2C.txt b/macosx/src/stm32flash_serial/src/I2C.txt
similarity index 100%
rename from macos/src/stm32flash_serial/src/I2C.txt
rename to macosx/src/stm32flash_serial/src/I2C.txt
diff --git a/macos/src/stm32flash_serial/src/Makefile b/macosx/src/stm32flash_serial/src/Makefile
similarity index 100%
rename from macos/src/stm32flash_serial/src/Makefile
rename to macosx/src/stm32flash_serial/src/Makefile
diff --git a/macos/src/stm32flash_serial/src/TODO b/macosx/src/stm32flash_serial/src/TODO
similarity index 100%
rename from macos/src/stm32flash_serial/src/TODO
rename to macosx/src/stm32flash_serial/src/TODO
diff --git a/macos/src/stm32flash_serial/src/dev_table.c b/macosx/src/stm32flash_serial/src/dev_table.c
similarity index 100%
rename from macos/src/stm32flash_serial/src/dev_table.c
rename to macosx/src/stm32flash_serial/src/dev_table.c
diff --git a/macos/src/stm32flash_serial/src/gpl-2.0.txt b/macosx/src/stm32flash_serial/src/gpl-2.0.txt
similarity index 100%
rename from macos/src/stm32flash_serial/src/gpl-2.0.txt
rename to macosx/src/stm32flash_serial/src/gpl-2.0.txt
diff --git a/macos/src/stm32flash_serial/src/i2c.c b/macosx/src/stm32flash_serial/src/i2c.c
similarity index 100%
rename from macos/src/stm32flash_serial/src/i2c.c
rename to macosx/src/stm32flash_serial/src/i2c.c
diff --git a/macos/src/stm32flash_serial/src/init.c b/macosx/src/stm32flash_serial/src/init.c
similarity index 100%
rename from macos/src/stm32flash_serial/src/init.c
rename to macosx/src/stm32flash_serial/src/init.c
diff --git a/macos/src/stm32flash_serial/src/init.h b/macosx/src/stm32flash_serial/src/init.h
similarity index 100%
rename from macos/src/stm32flash_serial/src/init.h
rename to macosx/src/stm32flash_serial/src/init.h
diff --git a/macos/src/stm32flash_serial/src/main.c b/macosx/src/stm32flash_serial/src/main.c
similarity index 100%
rename from macos/src/stm32flash_serial/src/main.c
rename to macosx/src/stm32flash_serial/src/main.c
diff --git a/macos/src/stm32flash_serial/src/parsers/Android.mk b/macosx/src/stm32flash_serial/src/parsers/Android.mk
similarity index 100%
rename from macos/src/stm32flash_serial/src/parsers/Android.mk
rename to macosx/src/stm32flash_serial/src/parsers/Android.mk
diff --git a/macos/src/stm32flash_serial/src/parsers/Makefile b/macosx/src/stm32flash_serial/src/parsers/Makefile
similarity index 100%
rename from macos/src/stm32flash_serial/src/parsers/Makefile
rename to macosx/src/stm32flash_serial/src/parsers/Makefile
diff --git a/macos/src/stm32flash_serial/src/parsers/binary.c b/macosx/src/stm32flash_serial/src/parsers/binary.c
similarity index 100%
rename from macos/src/stm32flash_serial/src/parsers/binary.c
rename to macosx/src/stm32flash_serial/src/parsers/binary.c
diff --git a/macos/src/stm32flash_serial/src/parsers/binary.h b/macosx/src/stm32flash_serial/src/parsers/binary.h
similarity index 100%
rename from macos/src/stm32flash_serial/src/parsers/binary.h
rename to macosx/src/stm32flash_serial/src/parsers/binary.h
diff --git a/macos/src/stm32flash_serial/src/parsers/hex.c b/macosx/src/stm32flash_serial/src/parsers/hex.c
similarity index 100%
rename from macos/src/stm32flash_serial/src/parsers/hex.c
rename to macosx/src/stm32flash_serial/src/parsers/hex.c
diff --git a/macos/src/stm32flash_serial/src/parsers/hex.h b/macosx/src/stm32flash_serial/src/parsers/hex.h
similarity index 100%
rename from macos/src/stm32flash_serial/src/parsers/hex.h
rename to macosx/src/stm32flash_serial/src/parsers/hex.h
diff --git a/macos/src/stm32flash_serial/src/parsers/parser.h b/macosx/src/stm32flash_serial/src/parsers/parser.h
similarity index 100%
rename from macos/src/stm32flash_serial/src/parsers/parser.h
rename to macosx/src/stm32flash_serial/src/parsers/parser.h
diff --git a/macos/src/stm32flash_serial/src/port.c b/macosx/src/stm32flash_serial/src/port.c
similarity index 100%
rename from macos/src/stm32flash_serial/src/port.c
rename to macosx/src/stm32flash_serial/src/port.c
diff --git a/macos/src/stm32flash_serial/src/port.h b/macosx/src/stm32flash_serial/src/port.h
similarity index 100%
rename from macos/src/stm32flash_serial/src/port.h
rename to macosx/src/stm32flash_serial/src/port.h
diff --git a/macos/src/stm32flash_serial/src/protocol.txt b/macosx/src/stm32flash_serial/src/protocol.txt
similarity index 100%
rename from macos/src/stm32flash_serial/src/protocol.txt
rename to macosx/src/stm32flash_serial/src/protocol.txt
diff --git a/macos/src/stm32flash_serial/src/serial.h b/macosx/src/stm32flash_serial/src/serial.h
similarity index 100%
rename from macos/src/stm32flash_serial/src/serial.h
rename to macosx/src/stm32flash_serial/src/serial.h
diff --git a/macos/src/stm32flash_serial/src/serial_common.c b/macosx/src/stm32flash_serial/src/serial_common.c
similarity index 100%
rename from macos/src/stm32flash_serial/src/serial_common.c
rename to macosx/src/stm32flash_serial/src/serial_common.c
diff --git a/macos/src/stm32flash_serial/src/serial_platform.c b/macosx/src/stm32flash_serial/src/serial_platform.c
similarity index 100%
rename from macos/src/stm32flash_serial/src/serial_platform.c
rename to macosx/src/stm32flash_serial/src/serial_platform.c
diff --git a/macos/src/stm32flash_serial/src/serial_posix.c b/macosx/src/stm32flash_serial/src/serial_posix.c
similarity index 100%
rename from macos/src/stm32flash_serial/src/serial_posix.c
rename to macosx/src/stm32flash_serial/src/serial_posix.c
diff --git a/macos/src/stm32flash_serial/src/serial_w32.c b/macosx/src/stm32flash_serial/src/serial_w32.c
similarity index 100%
rename from macos/src/stm32flash_serial/src/serial_w32.c
rename to macosx/src/stm32flash_serial/src/serial_w32.c
diff --git a/macos/src/stm32flash_serial/src/stm32.c b/macosx/src/stm32flash_serial/src/stm32.c
similarity index 100%
rename from macos/src/stm32flash_serial/src/stm32.c
rename to macosx/src/stm32flash_serial/src/stm32.c
diff --git a/macos/src/stm32flash_serial/src/stm32.h b/macosx/src/stm32flash_serial/src/stm32.h
similarity index 100%
rename from macos/src/stm32flash_serial/src/stm32.h
rename to macosx/src/stm32flash_serial/src/stm32.h
diff --git a/macos/src/stm32flash_serial/src/stm32flash.1 b/macosx/src/stm32flash_serial/src/stm32flash.1
similarity index 100%
rename from macos/src/stm32flash_serial/src/stm32flash.1
rename to macosx/src/stm32flash_serial/src/stm32flash.1
diff --git a/macos/src/stm32flash_serial/src/utils.c b/macosx/src/stm32flash_serial/src/utils.c
similarity index 100%
rename from macos/src/stm32flash_serial/src/utils.c
rename to macosx/src/stm32flash_serial/src/utils.c
diff --git a/macos/src/stm32flash_serial/src/utils.h b/macosx/src/stm32flash_serial/src/utils.h
similarity index 100%
rename from macos/src/stm32flash_serial/src/utils.h
rename to macosx/src/stm32flash_serial/src/utils.h
diff --git a/macos/src/upload-reset/upload-reset.c b/macosx/src/upload-reset/upload-reset.c
similarity index 100%
rename from macos/src/upload-reset/upload-reset.c
rename to macosx/src/upload-reset/upload-reset.c
diff --git a/macos/stlink/st-flash b/macosx/stlink/st-flash
similarity index 100%
rename from macos/stlink/st-flash
rename to macosx/stlink/st-flash
diff --git a/macos/stlink/st-info b/macosx/stlink/st-info
similarity index 100%
rename from macos/stlink/st-info
rename to macosx/stlink/st-info
diff --git a/macos/stlink/st-term b/macosx/stlink/st-term
similarity index 100%
rename from macos/stlink/st-term
rename to macosx/stlink/st-term
diff --git a/macos/stlink/st-util b/macosx/stlink/st-util
similarity index 100%
rename from macos/stlink/st-util
rename to macosx/stlink/st-util
diff --git a/macos/stlink_upload b/macosx/stlink_upload
similarity index 100%
rename from macos/stlink_upload
rename to macosx/stlink_upload
diff --git a/macos/stm32flash/stm32flash b/macosx/stm32flash/stm32flash
similarity index 100%
rename from macos/stm32flash/stm32flash
rename to macosx/stm32flash/stm32flash
diff --git a/macos/upload-reset b/macosx/upload-reset
similarity index 100%
rename from macos/upload-reset
rename to macosx/upload-reset
diff --git a/macos/upload_router b/macosx/upload_router
similarity index 100%
rename from macos/upload_router
rename to macosx/upload_router