Started restructuring ccLockstep