make the dir structure cleaner