Clean up module structure