Split the data structures package into two.