Major refactor of vimrc organization