Refactor Controllers for Router dependency injection

[rukemn]

Make it such that Router is injected into controllers, who register themselves at the router