Changing some filename and project structure
Fighting with git