Update directory structure to match current.
Merge branch 'gh-pages-update-directory-structure' into gh-pages
Merge branch 'gh-pages' of ssh://git.mysociety.org/data/git/public/alaveteli into gh-pages