reorganization, renaming, and refactoring

I think I'm done cleaning up everything. :)