Refactor into a controllers folder