dir structure redesign