restructuring in state and cluster manager