Refactoring controllers into one method per file, plus actions file