Rename modules extension to bundles, improving