Clean up module structure.