Reorganized vimrc