Reorganized dir layout