change module structure & namespace.