diff --git a/core/modules/parsers/newwikitextparser/blockrules/class.js b/core/modules/parsers/newwikitextparser/rules/class.js
similarity index 100%
rename from core/modules/parsers/newwikitextparser/blockrules/class.js
rename to core/modules/parsers/newwikitextparser/rules/class.js
diff --git a/core/modules/parsers/newwikitextparser/blockrules/code.js b/core/modules/parsers/newwikitextparser/rules/codeblock.js
similarity index 100%
rename from core/modules/parsers/newwikitextparser/blockrules/code.js
rename to core/modules/parsers/newwikitextparser/rules/codeblock.js
diff --git a/core/modules/parsers/newwikitextparser/runrules/code.js b/core/modules/parsers/newwikitextparser/rules/coderun.js
similarity index 100%
rename from core/modules/parsers/newwikitextparser/runrules/code.js
rename to core/modules/parsers/newwikitextparser/rules/coderun.js
diff --git a/core/modules/parsers/newwikitextparser/blockrules/heading.js b/core/modules/parsers/newwikitextparser/rules/heading.js
similarity index 100%
rename from core/modules/parsers/newwikitextparser/blockrules/heading.js
rename to core/modules/parsers/newwikitextparser/rules/heading.js
diff --git a/core/modules/parsers/newwikitextparser/blockrules/html.js b/core/modules/parsers/newwikitextparser/rules/html.js
similarity index 100%
rename from core/modules/parsers/newwikitextparser/blockrules/html.js
rename to core/modules/parsers/newwikitextparser/rules/html.js
diff --git a/core/modules/parsers/newwikitextparser/blockrules/list.js b/core/modules/parsers/newwikitextparser/rules/list.js
similarity index 100%
rename from core/modules/parsers/newwikitextparser/blockrules/list.js
rename to core/modules/parsers/newwikitextparser/rules/list.js
diff --git a/core/modules/parsers/newwikitextparser/runrules/macro.js b/core/modules/parsers/newwikitextparser/rules/macro.js
similarity index 100%
rename from core/modules/parsers/newwikitextparser/runrules/macro.js
rename to core/modules/parsers/newwikitextparser/rules/macro.js
diff --git a/core/modules/parsers/newwikitextparser/runrules/prettylink.js b/core/modules/parsers/newwikitextparser/rules/prettylink.js
similarity index 100%
rename from core/modules/parsers/newwikitextparser/runrules/prettylink.js
rename to core/modules/parsers/newwikitextparser/rules/prettylink.js
diff --git a/core/modules/parsers/newwikitextparser/blockrules/rule.js b/core/modules/parsers/newwikitextparser/rules/rule.js
similarity index 100%
rename from core/modules/parsers/newwikitextparser/blockrules/rule.js
rename to core/modules/parsers/newwikitextparser/rules/rule.js
diff --git a/core/modules/parsers/newwikitextparser/runrules/wikilink.js b/core/modules/parsers/newwikitextparser/rules/wikilink.js
similarity index 100%
rename from core/modules/parsers/newwikitextparser/runrules/wikilink.js
rename to core/modules/parsers/newwikitextparser/rules/wikilink.js