All bundles convert to submodules
Fix rtp