revised dir structure