Cleanup project structure
Adjusted the namespace