move some old files to proper spots, delete some other stuff

NOTE: we shouldn't use img/web but I left the two files in there that are still actually linked
Merge pull request #341 from beautyjoy/cleanup

move some old files to proper spots, delete some other stuff