Refactor into Resources and ServiceActor