improved dir structure