Added some folders and basic MVC functionality
Merge branch 'develop' into feature-#4
Work in progress
Merge branch 'feature-#4' into develop