change controllers structure