moving things around, and adding 404 pages