Reorganization of models