Rearranged classes in packets for a better overview