Moving some more files around.