rearranging dir structure