Upgrade the demo package
Begin restructurization