Clean up, directory renaming and semantics
Merge branch 'master' of github.com:JonSnowbd/espalier