reorganise Dir & File struc definitions