Revert "setup new repository structure"

This reverts commit 6d46bf4040291b45dbe5af1fafb286f7799881cc.
Revert "flatten master"

This reverts commit 35cd602385ffe8f7a3f7c94073b6e5d773495908.