Cleans up organization after change to vundle