@hackage module-management0.17.3

Clean up module imports, split and merge modules

Clean up module imports, split and merge modules.