Minor directory structure cleanup.