Improve vimrc organization