refactoring
Remove obsolete project file
small refactoring...
Merge branch 'feature/refactor' into develop