rename model files to x.*, fix up vimrc