modularization
Merge branch 'master' of github.com:carst-it/carsten