@hackage module-management0.10.1

Clean up module imports, split and merge modules

Clean up module imports, split and merge modules.