reorganize the directory structure