Change controller class names, add pages