rearranged dir structure