Moving PacketFactory into subdir