Refactoring to multiple controllers