restructured, now easier to add support for new TLDs