Reorganized data structure