Model structure reorganization