Routes refactored to controllers