Continue restructuring for module split