Moving controllers to match page structure