Move persistent data to make it easier to upgrade