diff --git a/snippets/html-mode/h1 b/snippets/html-mode/header/h1
similarity index 100%
rename from snippets/html-mode/h1
rename to snippets/html-mode/header/h1
diff --git a/snippets/html-mode/h2 b/snippets/html-mode/header/h2
similarity index 100%
rename from snippets/html-mode/h2
rename to snippets/html-mode/header/h2
diff --git a/snippets/html-mode/h3 b/snippets/html-mode/header/h3
similarity index 100%
rename from snippets/html-mode/h3
rename to snippets/html-mode/header/h3
diff --git a/snippets/html-mode/h4 b/snippets/html-mode/header/h4
similarity index 100%
rename from snippets/html-mode/h4
rename to snippets/html-mode/header/h4
diff --git a/snippets/html-mode/h5 b/snippets/html-mode/header/h5
similarity index 100%
rename from snippets/html-mode/h5
rename to snippets/html-mode/header/h5
diff --git a/snippets/html-mode/h6 b/snippets/html-mode/header/h6
similarity index 100%
rename from snippets/html-mode/h6
rename to snippets/html-mode/header/h6
diff --git a/snippets/html-mode/dd b/snippets/html-mode/list/dd
similarity index 100%
rename from snippets/html-mode/dd
rename to snippets/html-mode/list/dd
diff --git a/snippets/html-mode/dl b/snippets/html-mode/list/dl
similarity index 100%
rename from snippets/html-mode/dl
rename to snippets/html-mode/list/dl
diff --git a/snippets/html-mode/dl.id b/snippets/html-mode/list/dl.id
similarity index 100%
rename from snippets/html-mode/dl.id
rename to snippets/html-mode/list/dl.id
diff --git a/snippets/html-mode/dt b/snippets/html-mode/list/dt
similarity index 100%
rename from snippets/html-mode/dt
rename to snippets/html-mode/list/dt
diff --git a/snippets/html-mode/li b/snippets/html-mode/list/li
similarity index 100%
rename from snippets/html-mode/li
rename to snippets/html-mode/list/li
diff --git a/snippets/html-mode/li.class b/snippets/html-mode/list/li.class
similarity index 100%
rename from snippets/html-mode/li.class
rename to snippets/html-mode/list/li.class
diff --git a/snippets/html-mode/ol b/snippets/html-mode/list/ol
similarity index 100%
rename from snippets/html-mode/ol
rename to snippets/html-mode/list/ol
diff --git a/snippets/html-mode/ol.class b/snippets/html-mode/list/ol.class
similarity index 100%
rename from snippets/html-mode/ol.class
rename to snippets/html-mode/list/ol.class
diff --git a/snippets/html-mode/ol.id b/snippets/html-mode/list/ol.id
similarity index 100%
rename from snippets/html-mode/ol.id
rename to snippets/html-mode/list/ol.id
diff --git a/snippets/html-mode/ul b/snippets/html-mode/list/ul
similarity index 100%
rename from snippets/html-mode/ul
rename to snippets/html-mode/list/ul
diff --git a/snippets/html-mode/ul.class b/snippets/html-mode/list/ul.class
similarity index 100%
rename from snippets/html-mode/ul.class
rename to snippets/html-mode/list/ul.class
diff --git a/snippets/html-mode/ul.id b/snippets/html-mode/list/ul.id
similarity index 100%
rename from snippets/html-mode/ul.id
rename to snippets/html-mode/list/ul.id
diff --git a/snippets/html-mode/doctype b/snippets/html-mode/metadir/doctype
similarity index 100%
rename from snippets/html-mode/doctype
rename to snippets/html-mode/metadir/doctype
diff --git a/snippets/html-mode/doctype.xhml1 b/snippets/html-mode/metadir/doctype.xhml1
similarity index 100%
rename from snippets/html-mode/doctype.xhml1
rename to snippets/html-mode/metadir/doctype.xhml1
diff --git a/snippets/html-mode/doctype.xhtml1_1 b/snippets/html-mode/metadir/doctype.xhtml1_1
similarity index 100%
rename from snippets/html-mode/doctype.xhtml1_1
rename to snippets/html-mode/metadir/doctype.xhtml1_1
diff --git a/snippets/html-mode/doctype.xhtml1_strict b/snippets/html-mode/metadir/doctype.xhtml1_strict
similarity index 100%
rename from snippets/html-mode/doctype.xhtml1_strict
rename to snippets/html-mode/metadir/doctype.xhtml1_strict
diff --git a/snippets/html-mode/doctype.xhtml1_transitional b/snippets/html-mode/metadir/doctype.xhtml1_transitional
similarity index 100%
rename from snippets/html-mode/doctype.xhtml1_transitional
rename to snippets/html-mode/metadir/doctype.xhtml1_transitional
diff --git a/snippets/html-mode/meta b/snippets/html-mode/metadir/meta
similarity index 100%
rename from snippets/html-mode/meta
rename to snippets/html-mode/metadir/meta
diff --git a/snippets/html-mode/meta.http-equiv b/snippets/html-mode/metadir/meta.http-equiv
similarity index 100%
rename from snippets/html-mode/meta.http-equiv
rename to snippets/html-mode/metadir/meta.http-equiv
diff --git a/snippets/html-mode/table b/snippets/html-mode/tabledir/table
similarity index 100%
rename from snippets/html-mode/table
rename to snippets/html-mode/tabledir/table
diff --git a/snippets/html-mode/td b/snippets/html-mode/tabledir/td
similarity index 100%
rename from snippets/html-mode/td
rename to snippets/html-mode/tabledir/td
diff --git a/snippets/html-mode/th b/snippets/html-mode/tabledir/th
similarity index 100%
rename from snippets/html-mode/th
rename to snippets/html-mode/tabledir/th
diff --git a/snippets/html-mode/tr b/snippets/html-mode/tabledir/tr
similarity index 100%
rename from snippets/html-mode/tr
rename to snippets/html-mode/tabledir/tr