Refactor the Structure.
Upgrade.