Existing factories are now services

Resolves #10