WIP
Merge branch 'restructure' of github.com:jbutkowski/unify into restructure