Remove non-submodule bundles
Add back bundles as submodules