more rearranging into dir structure