More progress
Commit all except vendored modules
Re-vendor submodules in subdirectory