More restructuring, added Series service.
Moved more logic over to factories.