Major structure changes.