Reorganized dir structure.