Finished refactoring to new partition of pages and controllers