Further cleanup. Removed some of the unused code and files and rearanged the remaining files to (hopefully) create a more organized file tree.