Create service classes
Create distinct controllers
Merge branch 'split-into-services'