Re #6630. Moving files around again.