Convert module to module-alias where appropriate.
Remove obsolete module descriptors.