Reorganized DefaultController and StaticPageController