move things around
some intermediate changes
Merge branch 'master' into design
moving /public to /assets