refine the directory structure
refine the directory structure