Content structure tidy-up.