reorganize the repo
more code cleanup at server
improved file storage stub
cleanup
Merge branch 'master' into gh-pages