Moved FactoryProducer to lib