dir structure cleanup