Cleaned up file structure and code
Cleaned up all files and code