Started on cleaning up the entire project
Removed duplicate files