Cleaned up some unused files/code and restructured the source files.