restructed dir