dir structure revised