simplify module structure