More progress on dir structure.