More work on structuring the module names.