reorganized dir