new organization for pages and controllers