Rename modules to bundles
Rebame dependencies