Revert "Refactored into services - resulting in errors"

This reverts commit 95d4ef320bc4e5631d0e1f7e348427723a6e19aa.