Simplified code, removed unused files
Cleaned the project root