restructured the dir