Reorganization of the data structure