dir structure refined