Moved packets to their own class