refactor and rename a bit
Merge branch 'master' of github.com:berndbischl/mies