move vendor dirs around
remove old submodule dirs
move around submodules to convert them back into regular dirs