Fixing the project structure
Merge origin/master