Added new project structure
Merge origin/master