Rearchitect project layout
Merge branch 'master' into gemify-docs-code
gst
Merge remote-tracking branch 'source/master'