Cleaned up a lot of files, and fixed some bad design.