Refactored Controllers to separate files