Restructure. More robust on upgraded sites.