directory structure cleanup