revised yet another dir structure.