improve the structure of the dir