Moved the factory to the transport package