diff --git a/common/messageFormat/message.dtd b/common/dtd/messageFormat/message.dtd
similarity index 100%
rename from common/messageFormat/message.dtd
rename to common/dtd/messageFormat/message.dtd
diff --git a/common/messageFormat/message.json b/common/dtd/messageFormat/message.json
similarity index 99%
rename from common/messageFormat/message.json
rename to common/dtd/messageFormat/message.json
index 401b365d7f4..6d4036887a4 100644
--- a/common/messageFormat/message.json
+++ b/common/dtd/messageFormat/message.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
-  "$id": "https://github.com/unicode-org/cldr/blob/maint/maint-45/common/messageFormat/message.json",
+  "$id": "https://github.com/unicode-org/cldr/blob/maint/maint-45/common/dtd/messageFormat/message.json",
 
   "oneOf": [{ "$ref": "#/$defs/message" }, { "$ref": "#/$defs/select" }],
 
diff --git a/docs/ldml/tr35-messageFormat.md b/docs/ldml/tr35-messageFormat.md
index 33d82aa0468..1344b0f7764 100644
--- a/docs/ldml/tr35-messageFormat.md
+++ b/docs/ldml/tr35-messageFormat.md
@@ -1795,7 +1795,6 @@ _This section is non-normative._
 > This part of the specification is not part of the Tech Preview.
 
 The registry contains descriptions of function signatures.
-[`registry.dtd`](./registry.dtd) describes its data model.
 
 The main building block of the registry is the `<function>` element.
 It represents an implementation of a custom function available to translation at runtime.
@@ -3603,9 +3602,9 @@ To ensure compatibility across all platforms,
 this interchange data model is defined here using TypeScript notation.
 Two equivalent definitions of the data model are also provided:
 
-- [`message.json`](./message.json) is a JSON Schema definition,
+- `common/dtd/messageFormat/message.json` is a JSON Schema definition,
   for use with message data encoded as JSON or compatible formats, such as YAML.
-- [`message.dtd`](./message.dtd) is a document type definition (DTD),
+- `common/dtd/messageFormat/message.json` is a document type definition (DTD),
   for use with message data encoded as XML.
 
 Note that while the data model description below is the canonical one,