Refactor namespaces and update bundles