DEBUGGED - Before redoing folder structure
Restructured folders
Cleaning
Sync stuff up
Clean up