diff --git a/TODO b/TODO
deleted file mode 100644
index f9066c0e..00000000
--- a/TODO
+++ /dev/null
@@ -1,8 +0,0 @@
-##############################
-###   TODO LIST (18/08/12) ###
-##############################
-
-1. Add ability to fetch a specific extra, rather than pull down the whole category
-    - This requires extra calls to MB right now, so modify 1st mb artist call to pull down the
-      whole album list, then only send the desried ones to importer.py
-2. Update API with newstyle getExtras function (lacking entirely right now)
diff --git a/init-alt.freebsd b/init-scripts/init-alt.freebsd
similarity index 100%
rename from init-alt.freebsd
rename to init-scripts/init-alt.freebsd
diff --git a/init.fedora.centos.systemd b/init-scripts/init.fedora.centos.systemd
similarity index 100%
rename from init.fedora.centos.systemd
rename to init-scripts/init.fedora.centos.systemd
diff --git a/init.freebsd b/init-scripts/init.freebsd
similarity index 100%
rename from init.freebsd
rename to init-scripts/init.freebsd
diff --git a/init.osx b/init-scripts/init.osx
similarity index 100%
rename from init.osx
rename to init-scripts/init.osx
diff --git a/init.solaris11 b/init-scripts/init.solaris11
similarity index 100%
rename from init.solaris11
rename to init-scripts/init.solaris11
diff --git a/init.ubuntu b/init-scripts/init.ubuntu
similarity index 100%
rename from init.ubuntu
rename to init-scripts/init.ubuntu
diff --git a/init.upstart b/init-scripts/init.upstart
similarity index 100%
rename from init.upstart
rename to init-scripts/init.upstart