Improved dir structure.