Directory re-arrangements to put parser clusters back where they belong, now that they all compile in void-safe mode under 7.3.