reorganized dir structure