Rearranging dir structure