Restructure vimrc