moved and renamed some submodels