Rearranged dir structure