Moved page handlers into controller package