Create #3510, refactor the directory.