minor repository rearrangement