Restructured projects
Restructured projects
Merge branch 'feature/ProjectRestructure' into develop