Rename modules to bundle