More db file rearrangement