Extracting Logic from Bloated Controllers

Move complex logic into service classes to enable granular unit testing.