Improve the dir structure.