rework of dir structure