Merge pull request #1 from 90max/maximilian

file structure
Merge branch 'master' into maximilian