Refactor to controllers!