reorganized sub-generators