restructed dirs