Convert module to module-alias where appropriate.

Also remove obsolete module descriptors.