Update vimrc organization / structure
Update vimrc and change matching time