Flatten directory structure
Merge Ray's changes
Merge branch 'master' of https://github.com/alexanderfloh/feedbock