Reorganization of vimrc