restructed directory