Moved around the templates and static files