Reorganized module names, enabling.