Reorganization of model data