rearranging a few things (models, mostly)