reorganized a lot of similar data structures into the same packages