Spring Cleaning

Well summer cleaning really, just moving inactive stuff to sub-folder.