Reorganize, clean up vimrc