project structure
Merged feature branch 'projectstructure' into development