trying to convert to submodules
moved bundles to submodules