re< moving and sorting out some models