Re-organized vimrc