Revert "Reworked service classes to prepare for running on a server"

This reverts commit 28ecc337e8dfe183403ed1751984a57b0c9d0693.
Revert attempt