Cleaned up the project structure a bit
Refactored some of the filenames