Fix rearrangement; add missing files.