diff --git a/snippets/nxml-mode/h1 b/snippets/nxml-mode/header/h1
similarity index 100%
rename from snippets/nxml-mode/h1
rename to snippets/nxml-mode/header/h1
diff --git a/snippets/nxml-mode/h2 b/snippets/nxml-mode/header/h2
similarity index 100%
rename from snippets/nxml-mode/h2
rename to snippets/nxml-mode/header/h2
diff --git a/snippets/nxml-mode/h3 b/snippets/nxml-mode/header/h3
similarity index 100%
rename from snippets/nxml-mode/h3
rename to snippets/nxml-mode/header/h3
diff --git a/snippets/nxml-mode/h4 b/snippets/nxml-mode/header/h4
similarity index 100%
rename from snippets/nxml-mode/h4
rename to snippets/nxml-mode/header/h4
diff --git a/snippets/nxml-mode/h5 b/snippets/nxml-mode/header/h5
similarity index 100%
rename from snippets/nxml-mode/h5
rename to snippets/nxml-mode/header/h5
diff --git a/snippets/nxml-mode/h6 b/snippets/nxml-mode/header/h6
similarity index 100%
rename from snippets/nxml-mode/h6
rename to snippets/nxml-mode/header/h6
diff --git a/snippets/nxml-mode/doctype b/snippets/nxml-mode/metadir/doctype
similarity index 100%
rename from snippets/nxml-mode/doctype
rename to snippets/nxml-mode/metadir/doctype
diff --git a/snippets/nxml-mode/doctype.xhtml1_strict b/snippets/nxml-mode/metadir/doctype.xhtml1_strict
similarity index 100%
rename from snippets/nxml-mode/doctype.xhtml1_strict
rename to snippets/nxml-mode/metadir/doctype.xhtml1_strict
diff --git a/snippets/nxml-mode/doctype.xhtml1_transitional b/snippets/nxml-mode/metadir/doctype.xhtml1_transitional
similarity index 100%
rename from snippets/nxml-mode/doctype.xhtml1_transitional
rename to snippets/nxml-mode/metadir/doctype.xhtml1_transitional
diff --git a/snippets/nxml-mode/meta b/snippets/nxml-mode/metadir/meta
similarity index 100%
rename from snippets/nxml-mode/meta
rename to snippets/nxml-mode/metadir/meta