crap
it works
Merge branch 'feature/newStructure' into develop
Merge branch 'develop'