Moving some more files around to reduce cyclic dependencies.