dir structure rearranged