We don't want to move it, because we want to complete this refactor without changing savestate version