Some more structure changes.