Reorganized data structures.