Dir structure cleanup.