Refactor controller as service
Put CRUD templates together