VIM: Restructure vim to be more modular