Reorganized the data