Re-structure mode handling.