Reorganise vimrc