restructured the directory