diff --git a/README.md b/README.md
index 728dc46..4f3bd50 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Currently, ColorChord 2 is designed to run on Linux or Windows.  It's not partic
 ColorChord: Embedded
 --------------------
 
-There is work on an embedded version of ColorChord, which avoids floating point operations anywhere in the output pipeline.  Though I have made efforts to port it to AVRs, it doesn't seem feasable to operate on AVRs without some shifty tricks which I'd like to avoid, so I have retargeted my efforts to 32-bit systems, such as the STM32F303, STM32F407, and the (somehow) the ESP8266.  ColorChord Embedded uses a different codebase, located in the (embeddedcommon)[embeddedcommon/README.md] and distributed among the various embedded* folders.
+There is work on an embedded version of ColorChord, which avoids floating point operations anywhere in the output pipeline.  Though I have made efforts to port it to AVRs, it doesn't seem feasable to operate on AVRs without some shifty tricks which I'd like to avoid, so I have retargeted my efforts to 32-bit systems, such as the STM32F303, STM32F407, and the (somehow) the ESP8266.  ColorChord Embedded uses a different codebase, located in the [embeddedcommon](embeddedcommon/README.md) and distributed among the various embedded* folders.
 
 
 Building and Using
diff --git a/TODO b/TODO
deleted file mode 100644
index a7c2c83..0000000
--- a/TODO
+++ /dev/null
@@ -1,11 +0,0 @@
-Still to do:
-
-Try this:
-* Make Linear keep the order of the notes in-order.
-
-* For light finding, pick lights off the peaks to get number of lights to use.
-* For light shifting (for 1d-looping light systems) shift the centers of the notes, then vernoi between the notes.
-
-Brenden:
-* Consider running DFT on all channels and mixing results
-
diff --git a/DisplayArray.c b/colorchord2/DisplayArray.c
similarity index 100%
rename from DisplayArray.c
rename to colorchord2/DisplayArray.c
diff --git a/DisplayDMX.c b/colorchord2/DisplayDMX.c
similarity index 100%
rename from DisplayDMX.c
rename to colorchord2/DisplayDMX.c
diff --git a/DisplayNetwork.c b/colorchord2/DisplayNetwork.c
similarity index 100%
rename from DisplayNetwork.c
rename to colorchord2/DisplayNetwork.c
diff --git a/DisplayOUTDriver.c b/colorchord2/DisplayOUTDriver.c
similarity index 100%
rename from DisplayOUTDriver.c
rename to colorchord2/DisplayOUTDriver.c
diff --git a/DisplayPie.c b/colorchord2/DisplayPie.c
similarity index 100%
rename from DisplayPie.c
rename to colorchord2/DisplayPie.c
diff --git a/DisplayUSB2812.c b/colorchord2/DisplayUSB2812.c
similarity index 100%
rename from DisplayUSB2812.c
rename to colorchord2/DisplayUSB2812.c
diff --git a/DrawFunctions.c b/colorchord2/DrawFunctions.c
similarity index 100%
rename from DrawFunctions.c
rename to colorchord2/DrawFunctions.c
diff --git a/DrawFunctions.h b/colorchord2/DrawFunctions.h
similarity index 100%
rename from DrawFunctions.h
rename to colorchord2/DrawFunctions.h
diff --git a/Makefile b/colorchord2/Makefile
similarity index 100%
rename from Makefile
rename to colorchord2/Makefile
diff --git a/OutputLinear.c b/colorchord2/OutputLinear.c
similarity index 100%
rename from OutputLinear.c
rename to colorchord2/OutputLinear.c
diff --git a/OutputProminent.c b/colorchord2/OutputProminent.c
similarity index 100%
rename from OutputProminent.c
rename to colorchord2/OutputProminent.c
diff --git a/OutputVoronoi.c b/colorchord2/OutputVoronoi.c
similarity index 100%
rename from OutputVoronoi.c
rename to colorchord2/OutputVoronoi.c
diff --git a/RecorderPlugin.c b/colorchord2/RecorderPlugin.c
similarity index 100%
rename from RecorderPlugin.c
rename to colorchord2/RecorderPlugin.c
diff --git a/WinDriver.c b/colorchord2/WinDriver.c
similarity index 100%
rename from WinDriver.c
rename to colorchord2/WinDriver.c
diff --git a/XDriver.c b/colorchord2/XDriver.c
similarity index 100%
rename from XDriver.c
rename to colorchord2/XDriver.c
diff --git a/chash.c b/colorchord2/chash.c
similarity index 100%
rename from chash.c
rename to colorchord2/chash.c
diff --git a/chash.h b/colorchord2/chash.h
similarity index 100%
rename from chash.h
rename to colorchord2/chash.h
diff --git a/color.c b/colorchord2/color.c
similarity index 100%
rename from color.c
rename to colorchord2/color.c
diff --git a/color.h b/colorchord2/color.h
similarity index 100%
rename from color.h
rename to colorchord2/color.h
diff --git a/decompose.c b/colorchord2/decompose.c
similarity index 100%
rename from decompose.c
rename to colorchord2/decompose.c
diff --git a/decompose.h b/colorchord2/decompose.h
similarity index 100%
rename from decompose.h
rename to colorchord2/decompose.h
diff --git a/default.conf b/colorchord2/default.conf
similarity index 100%
rename from default.conf
rename to colorchord2/default.conf
diff --git a/dft.c b/colorchord2/dft.c
similarity index 100%
rename from dft.c
rename to colorchord2/dft.c
diff --git a/dft.h b/colorchord2/dft.h
similarity index 100%
rename from dft.h
rename to colorchord2/dft.h
diff --git a/dmx.conf b/colorchord2/dmx.conf
similarity index 100%
rename from dmx.conf
rename to colorchord2/dmx.conf
diff --git a/filter.c b/colorchord2/filter.c
similarity index 100%
rename from filter.c
rename to colorchord2/filter.c
diff --git a/filter.h b/colorchord2/filter.h
similarity index 100%
rename from filter.h
rename to colorchord2/filter.h
diff --git a/hook.c b/colorchord2/hook.c
similarity index 100%
rename from hook.c
rename to colorchord2/hook.c
diff --git a/hook.h b/colorchord2/hook.h
similarity index 100%
rename from hook.h
rename to colorchord2/hook.h
diff --git a/integerprog.conf b/colorchord2/integerprog.conf
similarity index 100%
rename from integerprog.conf
rename to colorchord2/integerprog.conf
diff --git a/linearpie.conf b/colorchord2/linearpie.conf
similarity index 100%
rename from linearpie.conf
rename to colorchord2/linearpie.conf
diff --git a/main.c b/colorchord2/main.c
similarity index 100%
rename from main.c
rename to colorchord2/main.c
diff --git a/netlight.conf b/colorchord2/netlight.conf
similarity index 100%
rename from netlight.conf
rename to colorchord2/netlight.conf
diff --git a/notefinder.c b/colorchord2/notefinder.c
similarity index 100%
rename from notefinder.c
rename to colorchord2/notefinder.c
diff --git a/notefinder.h b/colorchord2/notefinder.h
similarity index 100%
rename from notefinder.h
rename to colorchord2/notefinder.h
diff --git a/os_generic.c b/colorchord2/os_generic.c
similarity index 100%
rename from os_generic.c
rename to colorchord2/os_generic.c
diff --git a/os_generic.h b/colorchord2/os_generic.h
similarity index 100%
rename from os_generic.h
rename to colorchord2/os_generic.h
diff --git a/outdrivers.c b/colorchord2/outdrivers.c
similarity index 100%
rename from outdrivers.c
rename to colorchord2/outdrivers.c
diff --git a/outdrivers.h b/colorchord2/outdrivers.h
similarity index 100%
rename from outdrivers.h
rename to colorchord2/outdrivers.h
diff --git a/parameters.c b/colorchord2/parameters.c
similarity index 100%
rename from parameters.c
rename to colorchord2/parameters.c
diff --git a/parameters.h b/colorchord2/parameters.h
similarity index 100%
rename from parameters.h
rename to colorchord2/parameters.h
diff --git a/quickwash.conf b/colorchord2/quickwash.conf
similarity index 100%
rename from quickwash.conf
rename to colorchord2/quickwash.conf
diff --git a/recordtest.conf b/colorchord2/recordtest.conf
similarity index 100%
rename from recordtest.conf
rename to colorchord2/recordtest.conf
diff --git a/sort.c b/colorchord2/sort.c
similarity index 100%
rename from sort.c
rename to colorchord2/sort.c
diff --git a/sort.h b/colorchord2/sort.h
similarity index 100%
rename from sort.h
rename to colorchord2/sort.h
diff --git a/sound.c b/colorchord2/sound.c
similarity index 100%
rename from sound.c
rename to colorchord2/sound.c
diff --git a/sound.h b/colorchord2/sound.h
similarity index 100%
rename from sound.h
rename to colorchord2/sound.h
diff --git a/sound_alsa.c b/colorchord2/sound_alsa.c
similarity index 100%
rename from sound_alsa.c
rename to colorchord2/sound_alsa.c
diff --git a/sound_null.c b/colorchord2/sound_null.c
similarity index 100%
rename from sound_null.c
rename to colorchord2/sound_null.c
diff --git a/sound_pulse.c b/colorchord2/sound_pulse.c
similarity index 100%
rename from sound_pulse.c
rename to colorchord2/sound_pulse.c
diff --git a/sound_win.c b/colorchord2/sound_win.c
similarity index 100%
rename from sound_win.c
rename to colorchord2/sound_win.c
diff --git a/usb.conf b/colorchord2/usb.conf
similarity index 100%
rename from usb.conf
rename to colorchord2/usb.conf
diff --git a/util.c b/colorchord2/util.c
similarity index 100%
rename from util.c
rename to colorchord2/util.c
diff --git a/util.h b/colorchord2/util.h
similarity index 100%
rename from util.h
rename to colorchord2/util.h