Update vimrc and reorganize