Renaming - Cleaned up project structure a bit more
Refactoring - Cleaned up project structure a bit more