Move outdated stuff out of the way

But don't remove it totally right away.