Fix setupController
Rename controllers and router files appropriately