prep for relaunch
project layout;
Merge branch 'master' into gh-pages