clean up, reorganizatiions, and using vimcplugin library