revise dir structure