Client directories rearrangement