Rearrange folder structure and improve some things

Folder structure is rearranged so source is more similar to built folder
Grunt tasks are rearranged a bit
Change S3 uploading
  handle file globs
  upload in parallel
  respect cache control settings
  some other fixes
Plus a few small tweaks in js/html to reflect all this.