Upgrade restructure