Runner now instantiates the service container

* Didn't want the client to instantiate its own container - but this may change
* moved service stuff into service dir