Add main controller and change router