Moved some more old stuff around.