...
restructure
Merge pull request #12 from ustroetz/master

...