More directory fixups.