Again Bugfixes, should solve build problems
Merge pull request #17 from learning-layers/reorganizedProjectManagement

Again Bugfixes, should solve build problems