Directory reorganization, continued.