Renamed some classes and the project
Renamed some classes and the project
Small refactorings