redesign dir structure