Update vimrc and organize