Added packets and reorganized stuff