Revised dir structure.