Rejigged everything into the web folder