rearranged and renamed directories