vimrc restructure - finalized