Directory structure cleanup