Bugfixes in folder organisation.
Merge branch 'develop'