diff --git a/Makefile b/firmware/Makefile
similarity index 100%
rename from Makefile
rename to firmware/Makefile
diff --git a/src/hcolor.h b/firmware/src/hcolor.h
similarity index 100%
rename from src/hcolor.h
rename to firmware/src/hcolor.h
diff --git a/src/main.cpp b/firmware/src/main.cpp
similarity index 100%
rename from src/main.cpp
rename to firmware/src/main.cpp
diff --git a/teensy3/Arduino.h b/firmware/teensy3/Arduino.h
similarity index 100%
rename from teensy3/Arduino.h
rename to firmware/teensy3/Arduino.h
diff --git a/teensy3/Client.h b/firmware/teensy3/Client.h
similarity index 100%
rename from teensy3/Client.h
rename to firmware/teensy3/Client.h
diff --git a/teensy3/HardwareSerial.h b/firmware/teensy3/HardwareSerial.h
similarity index 100%
rename from teensy3/HardwareSerial.h
rename to firmware/teensy3/HardwareSerial.h
diff --git a/teensy3/HardwareSerial1.cpp b/firmware/teensy3/HardwareSerial1.cpp
similarity index 100%
rename from teensy3/HardwareSerial1.cpp
rename to firmware/teensy3/HardwareSerial1.cpp
diff --git a/teensy3/HardwareSerial2.cpp b/firmware/teensy3/HardwareSerial2.cpp
similarity index 100%
rename from teensy3/HardwareSerial2.cpp
rename to firmware/teensy3/HardwareSerial2.cpp
diff --git a/teensy3/HardwareSerial3.cpp b/firmware/teensy3/HardwareSerial3.cpp
similarity index 100%
rename from teensy3/HardwareSerial3.cpp
rename to firmware/teensy3/HardwareSerial3.cpp
diff --git a/teensy3/IPAddress.cpp b/firmware/teensy3/IPAddress.cpp
similarity index 100%
rename from teensy3/IPAddress.cpp
rename to firmware/teensy3/IPAddress.cpp
diff --git a/teensy3/IPAddress.h b/firmware/teensy3/IPAddress.h
similarity index 100%
rename from teensy3/IPAddress.h
rename to firmware/teensy3/IPAddress.h
diff --git a/teensy3/IntervalTimer.cpp b/firmware/teensy3/IntervalTimer.cpp
similarity index 100%
rename from teensy3/IntervalTimer.cpp
rename to firmware/teensy3/IntervalTimer.cpp
diff --git a/teensy3/IntervalTimer.h b/firmware/teensy3/IntervalTimer.h
similarity index 100%
rename from teensy3/IntervalTimer.h
rename to firmware/teensy3/IntervalTimer.h
diff --git a/teensy3/OctoWS2811.cpp b/firmware/teensy3/OctoWS2811.cpp
similarity index 100%
rename from teensy3/OctoWS2811.cpp
rename to firmware/teensy3/OctoWS2811.cpp
diff --git a/teensy3/OctoWS2811.h b/firmware/teensy3/OctoWS2811.h
similarity index 100%
rename from teensy3/OctoWS2811.h
rename to firmware/teensy3/OctoWS2811.h
diff --git a/teensy3/Print.cpp b/firmware/teensy3/Print.cpp
similarity index 100%
rename from teensy3/Print.cpp
rename to firmware/teensy3/Print.cpp
diff --git a/teensy3/Print.h b/firmware/teensy3/Print.h
similarity index 100%
rename from teensy3/Print.h
rename to firmware/teensy3/Print.h
diff --git a/teensy3/Printable.h b/firmware/teensy3/Printable.h
similarity index 100%
rename from teensy3/Printable.h
rename to firmware/teensy3/Printable.h
diff --git a/teensy3/Server.h b/firmware/teensy3/Server.h
similarity index 100%
rename from teensy3/Server.h
rename to firmware/teensy3/Server.h
diff --git a/teensy3/Stream.cpp b/firmware/teensy3/Stream.cpp
similarity index 100%
rename from teensy3/Stream.cpp
rename to firmware/teensy3/Stream.cpp
diff --git a/teensy3/Stream.h b/firmware/teensy3/Stream.h
similarity index 100%
rename from teensy3/Stream.h
rename to firmware/teensy3/Stream.h
diff --git a/teensy3/Tone.cpp b/firmware/teensy3/Tone.cpp
similarity index 100%
rename from teensy3/Tone.cpp
rename to firmware/teensy3/Tone.cpp
diff --git a/teensy3/Udp.h b/firmware/teensy3/Udp.h
similarity index 100%
rename from teensy3/Udp.h
rename to firmware/teensy3/Udp.h
diff --git a/teensy3/WCharacter.h b/firmware/teensy3/WCharacter.h
similarity index 100%
rename from teensy3/WCharacter.h
rename to firmware/teensy3/WCharacter.h
diff --git a/teensy3/WConstants.h b/firmware/teensy3/WConstants.h
similarity index 100%
rename from teensy3/WConstants.h
rename to firmware/teensy3/WConstants.h
diff --git a/teensy3/WMath.cpp b/firmware/teensy3/WMath.cpp
similarity index 100%
rename from teensy3/WMath.cpp
rename to firmware/teensy3/WMath.cpp
diff --git a/teensy3/WProgram.h b/firmware/teensy3/WProgram.h
similarity index 100%
rename from teensy3/WProgram.h
rename to firmware/teensy3/WProgram.h
diff --git a/teensy3/WString.cpp b/firmware/teensy3/WString.cpp
similarity index 100%
rename from teensy3/WString.cpp
rename to firmware/teensy3/WString.cpp
diff --git a/teensy3/WString.h b/firmware/teensy3/WString.h
similarity index 100%
rename from teensy3/WString.h
rename to firmware/teensy3/WString.h
diff --git a/teensy3/analog.c b/firmware/teensy3/analog.c
similarity index 100%
rename from teensy3/analog.c
rename to firmware/teensy3/analog.c
diff --git a/teensy3/arm_common_tables.h b/firmware/teensy3/arm_common_tables.h
similarity index 100%
rename from teensy3/arm_common_tables.h
rename to firmware/teensy3/arm_common_tables.h
diff --git a/teensy3/arm_math.h b/firmware/teensy3/arm_math.h
similarity index 100%
rename from teensy3/arm_math.h
rename to firmware/teensy3/arm_math.h
diff --git a/teensy3/avr/eeprom.h b/firmware/teensy3/avr/eeprom.h
similarity index 100%
rename from teensy3/avr/eeprom.h
rename to firmware/teensy3/avr/eeprom.h
diff --git a/teensy3/avr/interrupt.h b/firmware/teensy3/avr/interrupt.h
similarity index 100%
rename from teensy3/avr/interrupt.h
rename to firmware/teensy3/avr/interrupt.h
diff --git a/teensy3/avr/io.h b/firmware/teensy3/avr/io.h
similarity index 100%
rename from teensy3/avr/io.h
rename to firmware/teensy3/avr/io.h
diff --git a/teensy3/avr/pgmspace.h b/firmware/teensy3/avr/pgmspace.h
similarity index 100%
rename from teensy3/avr/pgmspace.h
rename to firmware/teensy3/avr/pgmspace.h
diff --git a/teensy3/avr_emulation.h b/firmware/teensy3/avr_emulation.h
similarity index 100%
rename from teensy3/avr_emulation.h
rename to firmware/teensy3/avr_emulation.h
diff --git a/teensy3/avr_functions.h b/firmware/teensy3/avr_functions.h
similarity index 100%
rename from teensy3/avr_functions.h
rename to firmware/teensy3/avr_functions.h
diff --git a/teensy3/binary.h b/firmware/teensy3/binary.h
similarity index 100%
rename from teensy3/binary.h
rename to firmware/teensy3/binary.h
diff --git a/teensy3/core_cm4.h b/firmware/teensy3/core_cm4.h
similarity index 100%
rename from teensy3/core_cm4.h
rename to firmware/teensy3/core_cm4.h
diff --git a/teensy3/core_cm4_simd.h b/firmware/teensy3/core_cm4_simd.h
similarity index 100%
rename from teensy3/core_cm4_simd.h
rename to firmware/teensy3/core_cm4_simd.h
diff --git a/teensy3/core_cmInstr.h b/firmware/teensy3/core_cmInstr.h
similarity index 100%
rename from teensy3/core_cmInstr.h
rename to firmware/teensy3/core_cmInstr.h
diff --git a/teensy3/core_id.h b/firmware/teensy3/core_id.h
similarity index 100%
rename from teensy3/core_id.h
rename to firmware/teensy3/core_id.h
diff --git a/teensy3/core_pins.h b/firmware/teensy3/core_pins.h
similarity index 100%
rename from teensy3/core_pins.h
rename to firmware/teensy3/core_pins.h
diff --git a/teensy3/eeprom.c b/firmware/teensy3/eeprom.c
similarity index 100%
rename from teensy3/eeprom.c
rename to firmware/teensy3/eeprom.c
diff --git a/teensy3/elapsedMillis.h b/firmware/teensy3/elapsedMillis.h
similarity index 100%
rename from teensy3/elapsedMillis.h
rename to firmware/teensy3/elapsedMillis.h
diff --git a/teensy3/keylayouts.c b/firmware/teensy3/keylayouts.c
similarity index 100%
rename from teensy3/keylayouts.c
rename to firmware/teensy3/keylayouts.c
diff --git a/teensy3/keylayouts.h b/firmware/teensy3/keylayouts.h
similarity index 100%
rename from teensy3/keylayouts.h
rename to firmware/teensy3/keylayouts.h
diff --git a/teensy3/main.cpp b/firmware/teensy3/main.cpp
similarity index 100%
rename from teensy3/main.cpp
rename to firmware/teensy3/main.cpp
diff --git a/teensy3/math_helper.c b/firmware/teensy3/math_helper.c
similarity index 100%
rename from teensy3/math_helper.c
rename to firmware/teensy3/math_helper.c
diff --git a/teensy3/math_helper.h b/firmware/teensy3/math_helper.h
similarity index 100%
rename from teensy3/math_helper.h
rename to firmware/teensy3/math_helper.h
diff --git a/teensy3/mk20dx128.c b/firmware/teensy3/mk20dx128.c
similarity index 100%
rename from teensy3/mk20dx128.c
rename to firmware/teensy3/mk20dx128.c
diff --git a/teensy3/mk20dx128.h b/firmware/teensy3/mk20dx128.h
similarity index 100%
rename from teensy3/mk20dx128.h
rename to firmware/teensy3/mk20dx128.h
diff --git a/teensy3/mk20dx128.ld b/firmware/teensy3/mk20dx128.ld
similarity index 100%
rename from teensy3/mk20dx128.ld
rename to firmware/teensy3/mk20dx128.ld
diff --git a/teensy3/nonstd.c b/firmware/teensy3/nonstd.c
similarity index 100%
rename from teensy3/nonstd.c
rename to firmware/teensy3/nonstd.c
diff --git a/teensy3/pins_arduino.h b/firmware/teensy3/pins_arduino.h
similarity index 100%
rename from teensy3/pins_arduino.h
rename to firmware/teensy3/pins_arduino.h
diff --git a/teensy3/pins_teensy.c b/firmware/teensy3/pins_teensy.c
similarity index 100%
rename from teensy3/pins_teensy.c
rename to firmware/teensy3/pins_teensy.c
diff --git a/teensy3/serial1.c b/firmware/teensy3/serial1.c
similarity index 100%
rename from teensy3/serial1.c
rename to firmware/teensy3/serial1.c
diff --git a/teensy3/serial2.c b/firmware/teensy3/serial2.c
similarity index 100%
rename from teensy3/serial2.c
rename to firmware/teensy3/serial2.c
diff --git a/teensy3/serial3.c b/firmware/teensy3/serial3.c
similarity index 100%
rename from teensy3/serial3.c
rename to firmware/teensy3/serial3.c
diff --git a/teensy3/touch.c b/firmware/teensy3/touch.c
similarity index 100%
rename from teensy3/touch.c
rename to firmware/teensy3/touch.c
diff --git a/teensy3/usb_desc.c b/firmware/teensy3/usb_desc.c
similarity index 100%
rename from teensy3/usb_desc.c
rename to firmware/teensy3/usb_desc.c
diff --git a/teensy3/usb_desc.h b/firmware/teensy3/usb_desc.h
similarity index 100%
rename from teensy3/usb_desc.h
rename to firmware/teensy3/usb_desc.h
diff --git a/teensy3/usb_dev.c b/firmware/teensy3/usb_dev.c
similarity index 100%
rename from teensy3/usb_dev.c
rename to firmware/teensy3/usb_dev.c
diff --git a/teensy3/usb_dev.h b/firmware/teensy3/usb_dev.h
similarity index 100%
rename from teensy3/usb_dev.h
rename to firmware/teensy3/usb_dev.h
diff --git a/teensy3/usb_flightsim.cpp b/firmware/teensy3/usb_flightsim.cpp
similarity index 100%
rename from teensy3/usb_flightsim.cpp
rename to firmware/teensy3/usb_flightsim.cpp
diff --git a/teensy3/usb_flightsim.h b/firmware/teensy3/usb_flightsim.h
similarity index 100%
rename from teensy3/usb_flightsim.h
rename to firmware/teensy3/usb_flightsim.h
diff --git a/teensy3/usb_inst.cpp b/firmware/teensy3/usb_inst.cpp
similarity index 100%
rename from teensy3/usb_inst.cpp
rename to firmware/teensy3/usb_inst.cpp
diff --git a/teensy3/usb_joystick.c b/firmware/teensy3/usb_joystick.c
similarity index 100%
rename from teensy3/usb_joystick.c
rename to firmware/teensy3/usb_joystick.c
diff --git a/teensy3/usb_joystick.h b/firmware/teensy3/usb_joystick.h
similarity index 100%
rename from teensy3/usb_joystick.h
rename to firmware/teensy3/usb_joystick.h
diff --git a/teensy3/usb_keyboard.c b/firmware/teensy3/usb_keyboard.c
similarity index 100%
rename from teensy3/usb_keyboard.c
rename to firmware/teensy3/usb_keyboard.c
diff --git a/teensy3/usb_keyboard.h b/firmware/teensy3/usb_keyboard.h
similarity index 100%
rename from teensy3/usb_keyboard.h
rename to firmware/teensy3/usb_keyboard.h
diff --git a/teensy3/usb_mem.c b/firmware/teensy3/usb_mem.c
similarity index 100%
rename from teensy3/usb_mem.c
rename to firmware/teensy3/usb_mem.c
diff --git a/teensy3/usb_mem.h b/firmware/teensy3/usb_mem.h
similarity index 100%
rename from teensy3/usb_mem.h
rename to firmware/teensy3/usb_mem.h
diff --git a/teensy3/usb_midi.c b/firmware/teensy3/usb_midi.c
similarity index 100%
rename from teensy3/usb_midi.c
rename to firmware/teensy3/usb_midi.c
diff --git a/teensy3/usb_midi.h b/firmware/teensy3/usb_midi.h
similarity index 100%
rename from teensy3/usb_midi.h
rename to firmware/teensy3/usb_midi.h
diff --git a/teensy3/usb_mouse.c b/firmware/teensy3/usb_mouse.c
similarity index 100%
rename from teensy3/usb_mouse.c
rename to firmware/teensy3/usb_mouse.c
diff --git a/teensy3/usb_mouse.h b/firmware/teensy3/usb_mouse.h
similarity index 100%
rename from teensy3/usb_mouse.h
rename to firmware/teensy3/usb_mouse.h
diff --git a/teensy3/usb_names.h b/firmware/teensy3/usb_names.h
similarity index 100%
rename from teensy3/usb_names.h
rename to firmware/teensy3/usb_names.h
diff --git a/teensy3/usb_rawhid.c b/firmware/teensy3/usb_rawhid.c
similarity index 100%
rename from teensy3/usb_rawhid.c
rename to firmware/teensy3/usb_rawhid.c
diff --git a/teensy3/usb_rawhid.h b/firmware/teensy3/usb_rawhid.h
similarity index 100%
rename from teensy3/usb_rawhid.h
rename to firmware/teensy3/usb_rawhid.h
diff --git a/teensy3/usb_seremu.c b/firmware/teensy3/usb_seremu.c
similarity index 100%
rename from teensy3/usb_seremu.c
rename to firmware/teensy3/usb_seremu.c
diff --git a/teensy3/usb_seremu.h b/firmware/teensy3/usb_seremu.h
similarity index 100%
rename from teensy3/usb_seremu.h
rename to firmware/teensy3/usb_seremu.h
diff --git a/teensy3/usb_serial.c b/firmware/teensy3/usb_serial.c
similarity index 100%
rename from teensy3/usb_serial.c
rename to firmware/teensy3/usb_serial.c
diff --git a/teensy3/usb_serial.h b/firmware/teensy3/usb_serial.h
similarity index 100%
rename from teensy3/usb_serial.h
rename to firmware/teensy3/usb_serial.h
diff --git a/teensy3/util/atomic.h b/firmware/teensy3/util/atomic.h
similarity index 100%
rename from teensy3/util/atomic.h
rename to firmware/teensy3/util/atomic.h
diff --git a/teensy3/util/delay.h b/firmware/teensy3/util/delay.h
similarity index 100%
rename from teensy3/util/delay.h
rename to firmware/teensy3/util/delay.h
diff --git a/teensy3/wiring.h b/firmware/teensy3/wiring.h
similarity index 100%
rename from teensy3/wiring.h
rename to firmware/teensy3/wiring.h
diff --git a/teensy3/wiring_private.h b/firmware/teensy3/wiring_private.h
similarity index 100%
rename from teensy3/wiring_private.h
rename to firmware/teensy3/wiring_private.h
diff --git a/teensy3/yield.c b/firmware/teensy3/yield.c
similarity index 100%
rename from teensy3/yield.c
rename to firmware/teensy3/yield.c