Reorganising of control structure