Further reorganize vimrc