Improve the directory structure.