Changes made to Packet Factory

Changed it to Data Factory, and made changes to the packets