H1: Moved files around some more.