Fixed folder structure
Merge branch 'Bas' of https://github.com/utwente-di/di14 into Bas