Apply back-to-roots stuff to moved files plus some cleanup.