Split classes into more logical packages