diff --git a/snippets/cc-mode/.yas-parents b/snippets/cc-mode/.yas-parents
new file mode 100644
index 0000000..eed5b44
--- /dev/null
+++ b/snippets/cc-mode/.yas-parents
@@ -0,0 +1 @@
+text-mode
diff --git a/snippets/text-mode/cc-mode/c++-mode/beginend b/snippets/cc-mode/c++-mode/beginend
similarity index 100%
rename from snippets/text-mode/cc-mode/c++-mode/beginend
rename to snippets/cc-mode/c++-mode/beginend
diff --git a/snippets/text-mode/cc-mode/c++-mode/class b/snippets/cc-mode/c++-mode/class
similarity index 100%
rename from snippets/text-mode/cc-mode/c++-mode/class
rename to snippets/cc-mode/c++-mode/class
diff --git a/snippets/text-mode/cc-mode/c++-mode/ns b/snippets/cc-mode/c++-mode/ns
similarity index 100%
rename from snippets/text-mode/cc-mode/c++-mode/ns
rename to snippets/cc-mode/c++-mode/ns
diff --git a/snippets/text-mode/cc-mode/c++-mode/template b/snippets/cc-mode/c++-mode/template
similarity index 100%
rename from snippets/text-mode/cc-mode/c++-mode/template
rename to snippets/cc-mode/c++-mode/template
diff --git a/snippets/text-mode/cc-mode/c++-mode/using b/snippets/cc-mode/c++-mode/using
similarity index 100%
rename from snippets/text-mode/cc-mode/c++-mode/using
rename to snippets/cc-mode/c++-mode/using
diff --git a/snippets/text-mode/cc-mode/c-mode/fopen b/snippets/cc-mode/c-mode/fopen
similarity index 100%
rename from snippets/text-mode/cc-mode/c-mode/fopen
rename to snippets/cc-mode/c-mode/fopen
diff --git a/snippets/text-mode/cc-mode/c-mode/printf b/snippets/cc-mode/c-mode/printf
similarity index 100%
rename from snippets/text-mode/cc-mode/c-mode/printf
rename to snippets/cc-mode/c-mode/printf
diff --git a/snippets/text-mode/cc-mode/csharp-mode/attrib b/snippets/cc-mode/csharp-mode/attrib
similarity index 100%
rename from snippets/text-mode/cc-mode/csharp-mode/attrib
rename to snippets/cc-mode/csharp-mode/attrib
diff --git a/snippets/text-mode/cc-mode/csharp-mode/attrib.1 b/snippets/cc-mode/csharp-mode/attrib.1
similarity index 100%
rename from snippets/text-mode/cc-mode/csharp-mode/attrib.1
rename to snippets/cc-mode/csharp-mode/attrib.1
diff --git a/snippets/text-mode/cc-mode/csharp-mode/attrib.2 b/snippets/cc-mode/csharp-mode/attrib.2
similarity index 100%
rename from snippets/text-mode/cc-mode/csharp-mode/attrib.2
rename to snippets/cc-mode/csharp-mode/attrib.2
diff --git a/snippets/text-mode/cc-mode/csharp-mode/class b/snippets/cc-mode/csharp-mode/class
similarity index 100%
rename from snippets/text-mode/cc-mode/csharp-mode/class
rename to snippets/cc-mode/csharp-mode/class
diff --git a/snippets/text-mode/cc-mode/csharp-mode/comment b/snippets/cc-mode/csharp-mode/comment
similarity index 100%
rename from snippets/text-mode/cc-mode/csharp-mode/comment
rename to snippets/cc-mode/csharp-mode/comment
diff --git a/snippets/text-mode/cc-mode/csharp-mode/comment.1 b/snippets/cc-mode/csharp-mode/comment.1
similarity index 100%
rename from snippets/text-mode/cc-mode/csharp-mode/comment.1
rename to snippets/cc-mode/csharp-mode/comment.1
diff --git a/snippets/text-mode/cc-mode/csharp-mode/comment.2 b/snippets/cc-mode/csharp-mode/comment.2
similarity index 100%
rename from snippets/text-mode/cc-mode/csharp-mode/comment.2
rename to snippets/cc-mode/csharp-mode/comment.2
diff --git a/snippets/text-mode/cc-mode/csharp-mode/comment.3 b/snippets/cc-mode/csharp-mode/comment.3
similarity index 100%
rename from snippets/text-mode/cc-mode/csharp-mode/comment.3
rename to snippets/cc-mode/csharp-mode/comment.3
diff --git a/snippets/text-mode/cc-mode/csharp-mode/method b/snippets/cc-mode/csharp-mode/method
similarity index 100%
rename from snippets/text-mode/cc-mode/csharp-mode/method
rename to snippets/cc-mode/csharp-mode/method
diff --git a/snippets/text-mode/cc-mode/csharp-mode/namespace b/snippets/cc-mode/csharp-mode/namespace
similarity index 100%
rename from snippets/text-mode/cc-mode/csharp-mode/namespace
rename to snippets/cc-mode/csharp-mode/namespace
diff --git a/snippets/text-mode/cc-mode/csharp-mode/prop b/snippets/cc-mode/csharp-mode/prop
similarity index 100%
rename from snippets/text-mode/cc-mode/csharp-mode/prop
rename to snippets/cc-mode/csharp-mode/prop
diff --git a/snippets/text-mode/cc-mode/csharp-mode/region b/snippets/cc-mode/csharp-mode/region
similarity index 100%
rename from snippets/text-mode/cc-mode/csharp-mode/region
rename to snippets/cc-mode/csharp-mode/region
diff --git a/snippets/text-mode/cc-mode/csharp-mode/using b/snippets/cc-mode/csharp-mode/using
similarity index 100%
rename from snippets/text-mode/cc-mode/csharp-mode/using
rename to snippets/cc-mode/csharp-mode/using
diff --git a/snippets/text-mode/cc-mode/csharp-mode/using.1 b/snippets/cc-mode/csharp-mode/using.1
similarity index 100%
rename from snippets/text-mode/cc-mode/csharp-mode/using.1
rename to snippets/cc-mode/csharp-mode/using.1
diff --git a/snippets/text-mode/cc-mode/csharp-mode/using.2 b/snippets/cc-mode/csharp-mode/using.2
similarity index 100%
rename from snippets/text-mode/cc-mode/csharp-mode/using.2
rename to snippets/cc-mode/csharp-mode/using.2
diff --git a/snippets/text-mode/cc-mode/do b/snippets/cc-mode/do
similarity index 100%
rename from snippets/text-mode/cc-mode/do
rename to snippets/cc-mode/do
diff --git a/snippets/text-mode/cc-mode/for b/snippets/cc-mode/for
similarity index 100%
rename from snippets/text-mode/cc-mode/for
rename to snippets/cc-mode/for
diff --git a/snippets/text-mode/cc-mode/if b/snippets/cc-mode/if
similarity index 100%
rename from snippets/text-mode/cc-mode/if
rename to snippets/cc-mode/if
diff --git a/snippets/text-mode/cc-mode/inc b/snippets/cc-mode/inc
similarity index 100%
rename from snippets/text-mode/cc-mode/inc
rename to snippets/cc-mode/inc
diff --git a/snippets/text-mode/cc-mode/inc.1 b/snippets/cc-mode/inc.1
similarity index 100%
rename from snippets/text-mode/cc-mode/inc.1
rename to snippets/cc-mode/inc.1
diff --git a/snippets/text-mode/cc-mode/main b/snippets/cc-mode/main
similarity index 100%
rename from snippets/text-mode/cc-mode/main
rename to snippets/cc-mode/main
diff --git a/snippets/text-mode/cc-mode/objc-mode/prop b/snippets/cc-mode/objc-mode/prop
similarity index 100%
rename from snippets/text-mode/cc-mode/objc-mode/prop
rename to snippets/cc-mode/objc-mode/prop
diff --git a/snippets/text-mode/cc-mode/once b/snippets/cc-mode/once
similarity index 100%
rename from snippets/text-mode/cc-mode/once
rename to snippets/cc-mode/once
diff --git a/snippets/text-mode/cc-mode/struct b/snippets/cc-mode/struct
similarity index 100%
rename from snippets/text-mode/cc-mode/struct
rename to snippets/cc-mode/struct
diff --git a/snippets/css-mode/.yas-parents b/snippets/css-mode/.yas-parents
new file mode 100644
index 0000000..eed5b44
--- /dev/null
+++ b/snippets/css-mode/.yas-parents
@@ -0,0 +1 @@
+text-mode
diff --git a/snippets/text-mode/css-mode/bg b/snippets/css-mode/bg
similarity index 100%
rename from snippets/text-mode/css-mode/bg
rename to snippets/css-mode/bg
diff --git a/snippets/text-mode/css-mode/bg.1 b/snippets/css-mode/bg.1
similarity index 100%
rename from snippets/text-mode/css-mode/bg.1
rename to snippets/css-mode/bg.1
diff --git a/snippets/text-mode/css-mode/bor b/snippets/css-mode/bor
similarity index 100%
rename from snippets/text-mode/css-mode/bor
rename to snippets/css-mode/bor
diff --git a/snippets/text-mode/css-mode/cl b/snippets/css-mode/cl
similarity index 100%
rename from snippets/text-mode/css-mode/cl
rename to snippets/css-mode/cl
diff --git a/snippets/text-mode/css-mode/disp.block b/snippets/css-mode/disp.block
similarity index 100%
rename from snippets/text-mode/css-mode/disp.block
rename to snippets/css-mode/disp.block
diff --git a/snippets/text-mode/css-mode/disp.inline b/snippets/css-mode/disp.inline
similarity index 100%
rename from snippets/text-mode/css-mode/disp.inline
rename to snippets/css-mode/disp.inline
diff --git a/snippets/text-mode/css-mode/disp.none b/snippets/css-mode/disp.none
similarity index 100%
rename from snippets/text-mode/css-mode/disp.none
rename to snippets/css-mode/disp.none
diff --git a/snippets/text-mode/css-mode/ff b/snippets/css-mode/ff
similarity index 100%
rename from snippets/text-mode/css-mode/ff
rename to snippets/css-mode/ff
diff --git a/snippets/text-mode/css-mode/fs b/snippets/css-mode/fs
similarity index 100%
rename from snippets/text-mode/css-mode/fs
rename to snippets/css-mode/fs
diff --git a/snippets/text-mode/css-mode/mar.bottom b/snippets/css-mode/mar.bottom
similarity index 100%
rename from snippets/text-mode/css-mode/mar.bottom
rename to snippets/css-mode/mar.bottom
diff --git a/snippets/text-mode/css-mode/mar.left b/snippets/css-mode/mar.left
similarity index 100%
rename from snippets/text-mode/css-mode/mar.left
rename to snippets/css-mode/mar.left
diff --git a/snippets/text-mode/css-mode/mar.mar b/snippets/css-mode/mar.mar
similarity index 100%
rename from snippets/text-mode/css-mode/mar.mar
rename to snippets/css-mode/mar.mar
diff --git a/snippets/text-mode/css-mode/mar.margin b/snippets/css-mode/mar.margin
similarity index 100%
rename from snippets/text-mode/css-mode/mar.margin
rename to snippets/css-mode/mar.margin
diff --git a/snippets/text-mode/css-mode/mar.right b/snippets/css-mode/mar.right
similarity index 100%
rename from snippets/text-mode/css-mode/mar.right
rename to snippets/css-mode/mar.right
diff --git a/snippets/text-mode/css-mode/mar.top b/snippets/css-mode/mar.top
similarity index 100%
rename from snippets/text-mode/css-mode/mar.top
rename to snippets/css-mode/mar.top
diff --git a/snippets/text-mode/css-mode/pad.bottom b/snippets/css-mode/pad.bottom
similarity index 100%
rename from snippets/text-mode/css-mode/pad.bottom
rename to snippets/css-mode/pad.bottom
diff --git a/snippets/text-mode/css-mode/pad.left b/snippets/css-mode/pad.left
similarity index 100%
rename from snippets/text-mode/css-mode/pad.left
rename to snippets/css-mode/pad.left
diff --git a/snippets/text-mode/css-mode/pad.pad b/snippets/css-mode/pad.pad
similarity index 100%
rename from snippets/text-mode/css-mode/pad.pad
rename to snippets/css-mode/pad.pad
diff --git a/snippets/text-mode/css-mode/pad.padding b/snippets/css-mode/pad.padding
similarity index 100%
rename from snippets/text-mode/css-mode/pad.padding
rename to snippets/css-mode/pad.padding
diff --git a/snippets/text-mode/css-mode/pad.right b/snippets/css-mode/pad.right
similarity index 100%
rename from snippets/text-mode/css-mode/pad.right
rename to snippets/css-mode/pad.right
diff --git a/snippets/text-mode/css-mode/pad.top b/snippets/css-mode/pad.top
similarity index 100%
rename from snippets/text-mode/css-mode/pad.top
rename to snippets/css-mode/pad.top
diff --git a/snippets/text-mode/emacs-lisp-mode/.read_me b/snippets/emacs-lisp-mode/.read_me
similarity index 100%
rename from snippets/text-mode/emacs-lisp-mode/.read_me
rename to snippets/emacs-lisp-mode/.read_me
diff --git a/snippets/emacs-lisp-mode/.yas-parents b/snippets/emacs-lisp-mode/.yas-parents
new file mode 100644
index 0000000..eed5b44
--- /dev/null
+++ b/snippets/emacs-lisp-mode/.yas-parents
@@ -0,0 +1 @@
+text-mode
diff --git a/snippets/text-mode/emacs-lisp-mode/defun b/snippets/emacs-lisp-mode/defun
similarity index 100%
rename from snippets/text-mode/emacs-lisp-mode/defun
rename to snippets/emacs-lisp-mode/defun
diff --git a/snippets/text-mode/emacs-lisp-mode/dired.process_marked b/snippets/emacs-lisp-mode/dired.process_marked
similarity index 100%
rename from snippets/text-mode/emacs-lisp-mode/dired.process_marked
rename to snippets/emacs-lisp-mode/dired.process_marked
diff --git a/snippets/text-mode/emacs-lisp-mode/file.process b/snippets/emacs-lisp-mode/file.process
similarity index 100%
rename from snippets/text-mode/emacs-lisp-mode/file.process
rename to snippets/emacs-lisp-mode/file.process
diff --git a/snippets/text-mode/emacs-lisp-mode/file.read-lines b/snippets/emacs-lisp-mode/file.read-lines
similarity index 100%
rename from snippets/text-mode/emacs-lisp-mode/file.read-lines
rename to snippets/emacs-lisp-mode/file.read-lines
diff --git a/snippets/text-mode/emacs-lisp-mode/find-replace b/snippets/emacs-lisp-mode/find-replace
similarity index 100%
rename from snippets/text-mode/emacs-lisp-mode/find-replace
rename to snippets/emacs-lisp-mode/find-replace
diff --git a/snippets/text-mode/emacs-lisp-mode/grabstring b/snippets/emacs-lisp-mode/grabstring
similarity index 100%
rename from snippets/text-mode/emacs-lisp-mode/grabstring
rename to snippets/emacs-lisp-mode/grabstring
diff --git a/snippets/text-mode/emacs-lisp-mode/grabthing b/snippets/emacs-lisp-mode/grabthing
similarity index 100%
rename from snippets/text-mode/emacs-lisp-mode/grabthing
rename to snippets/emacs-lisp-mode/grabthing
diff --git a/snippets/text-mode/emacs-lisp-mode/traverse_dir b/snippets/emacs-lisp-mode/traverse_dir
similarity index 100%
rename from snippets/text-mode/emacs-lisp-mode/traverse_dir
rename to snippets/emacs-lisp-mode/traverse_dir
diff --git a/snippets/text-mode/emacs-lisp-mode/word-or-region b/snippets/emacs-lisp-mode/word-or-region
similarity index 100%
rename from snippets/text-mode/emacs-lisp-mode/word-or-region
rename to snippets/emacs-lisp-mode/word-or-region
diff --git a/snippets/erlang-mode/.yas-parents b/snippets/erlang-mode/.yas-parents
new file mode 100644
index 0000000..eed5b44
--- /dev/null
+++ b/snippets/erlang-mode/.yas-parents
@@ -0,0 +1 @@
+text-mode
diff --git a/snippets/text-mode/erlang-mode/after b/snippets/erlang-mode/after
similarity index 100%
rename from snippets/text-mode/erlang-mode/after
rename to snippets/erlang-mode/after
diff --git a/snippets/text-mode/erlang-mode/begin b/snippets/erlang-mode/begin
similarity index 100%
rename from snippets/text-mode/erlang-mode/begin
rename to snippets/erlang-mode/begin
diff --git a/snippets/text-mode/erlang-mode/beh b/snippets/erlang-mode/beh
similarity index 100%
rename from snippets/text-mode/erlang-mode/beh
rename to snippets/erlang-mode/beh
diff --git a/snippets/text-mode/erlang-mode/case b/snippets/erlang-mode/case
similarity index 100%
rename from snippets/text-mode/erlang-mode/case
rename to snippets/erlang-mode/case
diff --git a/snippets/text-mode/erlang-mode/compile b/snippets/erlang-mode/compile
similarity index 100%
rename from snippets/text-mode/erlang-mode/compile
rename to snippets/erlang-mode/compile
diff --git a/snippets/text-mode/erlang-mode/def b/snippets/erlang-mode/def
similarity index 100%
rename from snippets/text-mode/erlang-mode/def
rename to snippets/erlang-mode/def
diff --git a/snippets/text-mode/erlang-mode/exp b/snippets/erlang-mode/exp
similarity index 100%
rename from snippets/text-mode/erlang-mode/exp
rename to snippets/erlang-mode/exp
diff --git a/snippets/text-mode/erlang-mode/fun b/snippets/erlang-mode/fun
similarity index 100%
rename from snippets/text-mode/erlang-mode/fun
rename to snippets/erlang-mode/fun
diff --git a/snippets/text-mode/erlang-mode/if b/snippets/erlang-mode/if
similarity index 100%
rename from snippets/text-mode/erlang-mode/if
rename to snippets/erlang-mode/if
diff --git a/snippets/text-mode/erlang-mode/ifdef b/snippets/erlang-mode/ifdef
similarity index 100%
rename from snippets/text-mode/erlang-mode/ifdef
rename to snippets/erlang-mode/ifdef
diff --git a/snippets/text-mode/erlang-mode/ifndef b/snippets/erlang-mode/ifndef
similarity index 100%
rename from snippets/text-mode/erlang-mode/ifndef
rename to snippets/erlang-mode/ifndef
diff --git a/snippets/text-mode/erlang-mode/imp b/snippets/erlang-mode/imp
similarity index 100%
rename from snippets/text-mode/erlang-mode/imp
rename to snippets/erlang-mode/imp
diff --git a/snippets/text-mode/erlang-mode/inc b/snippets/erlang-mode/inc
similarity index 100%
rename from snippets/text-mode/erlang-mode/inc
rename to snippets/erlang-mode/inc
diff --git a/snippets/text-mode/erlang-mode/inc.lib b/snippets/erlang-mode/inc.lib
similarity index 100%
rename from snippets/text-mode/erlang-mode/inc.lib
rename to snippets/erlang-mode/inc.lib
diff --git a/snippets/text-mode/erlang-mode/loop b/snippets/erlang-mode/loop
similarity index 100%
rename from snippets/text-mode/erlang-mode/loop
rename to snippets/erlang-mode/loop
diff --git a/snippets/text-mode/erlang-mode/mod b/snippets/erlang-mode/mod
similarity index 100%
rename from snippets/text-mode/erlang-mode/mod
rename to snippets/erlang-mode/mod
diff --git a/snippets/text-mode/erlang-mode/rcv b/snippets/erlang-mode/rcv
similarity index 100%
rename from snippets/text-mode/erlang-mode/rcv
rename to snippets/erlang-mode/rcv
diff --git a/snippets/text-mode/erlang-mode/rcv.after b/snippets/erlang-mode/rcv.after
similarity index 100%
rename from snippets/text-mode/erlang-mode/rcv.after
rename to snippets/erlang-mode/rcv.after
diff --git a/snippets/text-mode/erlang-mode/rec b/snippets/erlang-mode/rec
similarity index 100%
rename from snippets/text-mode/erlang-mode/rec
rename to snippets/erlang-mode/rec
diff --git a/snippets/text-mode/erlang-mode/try b/snippets/erlang-mode/try
similarity index 100%
rename from snippets/text-mode/erlang-mode/try
rename to snippets/erlang-mode/try
diff --git a/snippets/text-mode/erlang-mode/undef b/snippets/erlang-mode/undef
similarity index 100%
rename from snippets/text-mode/erlang-mode/undef
rename to snippets/erlang-mode/undef
diff --git a/snippets/f90-mode/.yas-parents b/snippets/f90-mode/.yas-parents
new file mode 100644
index 0000000..eed5b44
--- /dev/null
+++ b/snippets/f90-mode/.yas-parents
@@ -0,0 +1 @@
+text-mode
diff --git a/snippets/text-mode/f90-mode/au b/snippets/f90-mode/au
similarity index 100%
rename from snippets/text-mode/f90-mode/au
rename to snippets/f90-mode/au
diff --git a/snippets/text-mode/f90-mode/bd b/snippets/f90-mode/bd
similarity index 100%
rename from snippets/text-mode/f90-mode/bd
rename to snippets/f90-mode/bd
diff --git a/snippets/text-mode/f90-mode/c b/snippets/f90-mode/c
similarity index 100%
rename from snippets/text-mode/f90-mode/c
rename to snippets/f90-mode/c
diff --git a/snippets/text-mode/f90-mode/ch b/snippets/f90-mode/ch
similarity index 100%
rename from snippets/text-mode/f90-mode/ch
rename to snippets/f90-mode/ch
diff --git a/snippets/text-mode/f90-mode/cx b/snippets/f90-mode/cx
similarity index 100%
rename from snippets/text-mode/f90-mode/cx
rename to snippets/f90-mode/cx
diff --git a/snippets/text-mode/f90-mode/dc b/snippets/f90-mode/dc
similarity index 100%
rename from snippets/text-mode/f90-mode/dc
rename to snippets/f90-mode/dc
diff --git a/snippets/text-mode/f90-mode/do b/snippets/f90-mode/do
similarity index 100%
rename from snippets/text-mode/f90-mode/do
rename to snippets/f90-mode/do
diff --git a/snippets/text-mode/f90-mode/dp b/snippets/f90-mode/dp
similarity index 100%
rename from snippets/text-mode/f90-mode/dp
rename to snippets/f90-mode/dp
diff --git a/snippets/text-mode/f90-mode/eq b/snippets/f90-mode/eq
similarity index 100%
rename from snippets/text-mode/f90-mode/eq
rename to snippets/f90-mode/eq
diff --git a/snippets/text-mode/f90-mode/ib b/snippets/f90-mode/ib
similarity index 100%
rename from snippets/text-mode/f90-mode/ib
rename to snippets/f90-mode/ib
diff --git a/snippets/text-mode/f90-mode/ic b/snippets/f90-mode/ic
similarity index 100%
rename from snippets/text-mode/f90-mode/ic
rename to snippets/f90-mode/ic
diff --git a/snippets/text-mode/f90-mode/ich b/snippets/f90-mode/ich
similarity index 100%
rename from snippets/text-mode/f90-mode/ich
rename to snippets/f90-mode/ich
diff --git a/snippets/text-mode/f90-mode/if b/snippets/f90-mode/if
similarity index 100%
rename from snippets/text-mode/f90-mode/if
rename to snippets/f90-mode/if
diff --git a/snippets/text-mode/f90-mode/ii b/snippets/f90-mode/ii
similarity index 100%
rename from snippets/text-mode/f90-mode/ii
rename to snippets/f90-mode/ii
diff --git a/snippets/text-mode/f90-mode/il b/snippets/f90-mode/il
similarity index 100%
rename from snippets/text-mode/f90-mode/il
rename to snippets/f90-mode/il
diff --git a/snippets/text-mode/f90-mode/in b/snippets/f90-mode/in
similarity index 100%
rename from snippets/text-mode/f90-mode/in
rename to snippets/f90-mode/in
diff --git a/snippets/text-mode/f90-mode/inc b/snippets/f90-mode/inc
similarity index 100%
rename from snippets/text-mode/f90-mode/inc
rename to snippets/f90-mode/inc
diff --git a/snippets/text-mode/f90-mode/intr b/snippets/f90-mode/intr
similarity index 100%
rename from snippets/text-mode/f90-mode/intr
rename to snippets/f90-mode/intr
diff --git a/snippets/text-mode/f90-mode/ir b/snippets/f90-mode/ir
similarity index 100%
rename from snippets/text-mode/f90-mode/ir
rename to snippets/f90-mode/ir
diff --git a/snippets/text-mode/f90-mode/l b/snippets/f90-mode/l
similarity index 100%
rename from snippets/text-mode/f90-mode/l
rename to snippets/f90-mode/l
diff --git a/snippets/text-mode/f90-mode/pa b/snippets/f90-mode/pa
similarity index 100%
rename from snippets/text-mode/f90-mode/pa
rename to snippets/f90-mode/pa
diff --git a/snippets/text-mode/f90-mode/pr b/snippets/f90-mode/pr
similarity index 100%
rename from snippets/text-mode/f90-mode/pr
rename to snippets/f90-mode/pr
diff --git a/snippets/text-mode/f90-mode/re b/snippets/f90-mode/re
similarity index 100%
rename from snippets/text-mode/f90-mode/re
rename to snippets/f90-mode/re
diff --git a/snippets/text-mode/f90-mode/st b/snippets/f90-mode/st
similarity index 100%
rename from snippets/text-mode/f90-mode/st
rename to snippets/f90-mode/st
diff --git a/snippets/text-mode/f90-mode/su b/snippets/f90-mode/su
similarity index 100%
rename from snippets/text-mode/f90-mode/su
rename to snippets/f90-mode/su
diff --git a/snippets/text-mode/f90-mode/wr b/snippets/f90-mode/wr
similarity index 100%
rename from snippets/text-mode/f90-mode/wr
rename to snippets/f90-mode/wr
diff --git a/snippets/html-mode/.yas-parents b/snippets/html-mode/.yas-parents
new file mode 100644
index 0000000..eed5b44
--- /dev/null
+++ b/snippets/html-mode/.yas-parents
@@ -0,0 +1 @@
+text-mode
diff --git a/snippets/text-mode/html-mode/body b/snippets/html-mode/body
similarity index 100%
rename from snippets/text-mode/html-mode/body
rename to snippets/html-mode/body
diff --git a/snippets/text-mode/html-mode/br b/snippets/html-mode/br
similarity index 100%
rename from snippets/text-mode/html-mode/br
rename to snippets/html-mode/br
diff --git a/snippets/text-mode/html-mode/code b/snippets/html-mode/code
similarity index 100%
rename from snippets/text-mode/html-mode/code
rename to snippets/html-mode/code
diff --git a/snippets/text-mode/html-mode/code.class b/snippets/html-mode/code.class
similarity index 100%
rename from snippets/text-mode/html-mode/code.class
rename to snippets/html-mode/code.class
diff --git a/snippets/text-mode/html-mode/dd b/snippets/html-mode/dd
similarity index 100%
rename from snippets/text-mode/html-mode/dd
rename to snippets/html-mode/dd
diff --git a/snippets/text-mode/html-mode/div b/snippets/html-mode/div
similarity index 100%
rename from snippets/text-mode/html-mode/div
rename to snippets/html-mode/div
diff --git a/snippets/text-mode/html-mode/div.class b/snippets/html-mode/div.class
similarity index 100%
rename from snippets/text-mode/html-mode/div.class
rename to snippets/html-mode/div.class
diff --git a/snippets/text-mode/html-mode/div.id b/snippets/html-mode/div.id
similarity index 100%
rename from snippets/text-mode/html-mode/div.id
rename to snippets/html-mode/div.id
diff --git a/snippets/text-mode/html-mode/div.id-class b/snippets/html-mode/div.id-class
similarity index 100%
rename from snippets/text-mode/html-mode/div.id-class
rename to snippets/html-mode/div.id-class
diff --git a/snippets/text-mode/html-mode/dl b/snippets/html-mode/dl
similarity index 100%
rename from snippets/text-mode/html-mode/dl
rename to snippets/html-mode/dl
diff --git a/snippets/text-mode/html-mode/dl.id b/snippets/html-mode/dl.id
similarity index 100%
rename from snippets/text-mode/html-mode/dl.id
rename to snippets/html-mode/dl.id
diff --git a/snippets/text-mode/html-mode/doctype b/snippets/html-mode/doctype
similarity index 100%
rename from snippets/text-mode/html-mode/doctype
rename to snippets/html-mode/doctype
diff --git a/snippets/text-mode/html-mode/doctype.xhml1 b/snippets/html-mode/doctype.xhml1
similarity index 100%
rename from snippets/text-mode/html-mode/doctype.xhml1
rename to snippets/html-mode/doctype.xhml1
diff --git a/snippets/text-mode/html-mode/doctype.xhtml1_1 b/snippets/html-mode/doctype.xhtml1_1
similarity index 100%
rename from snippets/text-mode/html-mode/doctype.xhtml1_1
rename to snippets/html-mode/doctype.xhtml1_1
diff --git a/snippets/text-mode/html-mode/doctype.xhtml1_strict b/snippets/html-mode/doctype.xhtml1_strict
similarity index 100%
rename from snippets/text-mode/html-mode/doctype.xhtml1_strict
rename to snippets/html-mode/doctype.xhtml1_strict
diff --git a/snippets/text-mode/html-mode/doctype.xhtml1_transitional b/snippets/html-mode/doctype.xhtml1_transitional
similarity index 100%
rename from snippets/text-mode/html-mode/doctype.xhtml1_transitional
rename to snippets/html-mode/doctype.xhtml1_transitional
diff --git a/snippets/text-mode/html-mode/dov b/snippets/html-mode/dov
similarity index 100%
rename from snippets/text-mode/html-mode/dov
rename to snippets/html-mode/dov
diff --git a/snippets/text-mode/html-mode/dt b/snippets/html-mode/dt
similarity index 100%
rename from snippets/text-mode/html-mode/dt
rename to snippets/html-mode/dt
diff --git a/snippets/text-mode/html-mode/form b/snippets/html-mode/form
similarity index 100%
rename from snippets/text-mode/html-mode/form
rename to snippets/html-mode/form
diff --git a/snippets/text-mode/html-mode/h1 b/snippets/html-mode/h1
similarity index 100%
rename from snippets/text-mode/html-mode/h1
rename to snippets/html-mode/h1
diff --git a/snippets/text-mode/html-mode/h2 b/snippets/html-mode/h2
similarity index 100%
rename from snippets/text-mode/html-mode/h2
rename to snippets/html-mode/h2
diff --git a/snippets/text-mode/html-mode/h3 b/snippets/html-mode/h3
similarity index 100%
rename from snippets/text-mode/html-mode/h3
rename to snippets/html-mode/h3
diff --git a/snippets/text-mode/html-mode/h4 b/snippets/html-mode/h4
similarity index 100%
rename from snippets/text-mode/html-mode/h4
rename to snippets/html-mode/h4
diff --git a/snippets/text-mode/html-mode/h5 b/snippets/html-mode/h5
similarity index 100%
rename from snippets/text-mode/html-mode/h5
rename to snippets/html-mode/h5
diff --git a/snippets/text-mode/html-mode/h6 b/snippets/html-mode/h6
similarity index 100%
rename from snippets/text-mode/html-mode/h6
rename to snippets/html-mode/h6
diff --git a/snippets/text-mode/html-mode/head b/snippets/html-mode/head
similarity index 100%
rename from snippets/text-mode/html-mode/head
rename to snippets/html-mode/head
diff --git a/snippets/text-mode/html-mode/hr b/snippets/html-mode/hr
similarity index 100%
rename from snippets/text-mode/html-mode/hr
rename to snippets/html-mode/hr
diff --git a/snippets/text-mode/html-mode/href b/snippets/html-mode/href
similarity index 100%
rename from snippets/text-mode/html-mode/href
rename to snippets/html-mode/href
diff --git a/snippets/text-mode/html-mode/html b/snippets/html-mode/html
similarity index 100%
rename from snippets/text-mode/html-mode/html
rename to snippets/html-mode/html
diff --git a/snippets/text-mode/html-mode/html.xmlns b/snippets/html-mode/html.xmlns
similarity index 100%
rename from snippets/text-mode/html-mode/html.xmlns
rename to snippets/html-mode/html.xmlns
diff --git a/snippets/text-mode/html-mode/img b/snippets/html-mode/img
similarity index 100%
rename from snippets/text-mode/html-mode/img
rename to snippets/html-mode/img
diff --git a/snippets/text-mode/html-mode/input b/snippets/html-mode/input
similarity index 100%
rename from snippets/text-mode/html-mode/input
rename to snippets/html-mode/input
diff --git a/snippets/text-mode/html-mode/li b/snippets/html-mode/li
similarity index 100%
rename from snippets/text-mode/html-mode/li
rename to snippets/html-mode/li
diff --git a/snippets/text-mode/html-mode/li.class b/snippets/html-mode/li.class
similarity index 100%
rename from snippets/text-mode/html-mode/li.class
rename to snippets/html-mode/li.class
diff --git a/snippets/text-mode/html-mode/link.stylesheet b/snippets/html-mode/link.stylesheet
similarity index 100%
rename from snippets/text-mode/html-mode/link.stylesheet
rename to snippets/html-mode/link.stylesheet
diff --git a/snippets/text-mode/html-mode/link.stylesheet-ie b/snippets/html-mode/link.stylesheet-ie
similarity index 100%
rename from snippets/text-mode/html-mode/link.stylesheet-ie
rename to snippets/html-mode/link.stylesheet-ie
diff --git a/snippets/text-mode/html-mode/mailto b/snippets/html-mode/mailto
similarity index 100%
rename from snippets/text-mode/html-mode/mailto
rename to snippets/html-mode/mailto
diff --git a/snippets/text-mode/html-mode/meta b/snippets/html-mode/meta
similarity index 100%
rename from snippets/text-mode/html-mode/meta
rename to snippets/html-mode/meta
diff --git a/snippets/text-mode/html-mode/meta.http-equiv b/snippets/html-mode/meta.http-equiv
similarity index 100%
rename from snippets/text-mode/html-mode/meta.http-equiv
rename to snippets/html-mode/meta.http-equiv
diff --git a/snippets/text-mode/html-mode/ol b/snippets/html-mode/ol
similarity index 100%
rename from snippets/text-mode/html-mode/ol
rename to snippets/html-mode/ol
diff --git a/snippets/text-mode/html-mode/ol.class b/snippets/html-mode/ol.class
similarity index 100%
rename from snippets/text-mode/html-mode/ol.class
rename to snippets/html-mode/ol.class
diff --git a/snippets/text-mode/html-mode/ol.id b/snippets/html-mode/ol.id
similarity index 100%
rename from snippets/text-mode/html-mode/ol.id
rename to snippets/html-mode/ol.id
diff --git a/snippets/text-mode/html-mode/p b/snippets/html-mode/p
similarity index 100%
rename from snippets/text-mode/html-mode/p
rename to snippets/html-mode/p
diff --git a/snippets/text-mode/html-mode/pre b/snippets/html-mode/pre
similarity index 100%
rename from snippets/text-mode/html-mode/pre
rename to snippets/html-mode/pre
diff --git a/snippets/text-mode/html-mode/quote b/snippets/html-mode/quote
similarity index 100%
rename from snippets/text-mode/html-mode/quote
rename to snippets/html-mode/quote
diff --git a/snippets/text-mode/html-mode/script.javascript b/snippets/html-mode/script.javascript
similarity index 100%
rename from snippets/text-mode/html-mode/script.javascript
rename to snippets/html-mode/script.javascript
diff --git a/snippets/text-mode/html-mode/script.javascript-src b/snippets/html-mode/script.javascript-src
similarity index 100%
rename from snippets/text-mode/html-mode/script.javascript-src
rename to snippets/html-mode/script.javascript-src
diff --git a/snippets/text-mode/html-mode/span b/snippets/html-mode/span
similarity index 100%
rename from snippets/text-mode/html-mode/span
rename to snippets/html-mode/span
diff --git a/snippets/text-mode/html-mode/span.class b/snippets/html-mode/span.class
similarity index 100%
rename from snippets/text-mode/html-mode/span.class
rename to snippets/html-mode/span.class
diff --git a/snippets/text-mode/html-mode/span.id b/snippets/html-mode/span.id
similarity index 100%
rename from snippets/text-mode/html-mode/span.id
rename to snippets/html-mode/span.id
diff --git a/snippets/text-mode/html-mode/style b/snippets/html-mode/style
similarity index 100%
rename from snippets/text-mode/html-mode/style
rename to snippets/html-mode/style
diff --git a/snippets/text-mode/html-mode/table b/snippets/html-mode/table
similarity index 100%
rename from snippets/text-mode/html-mode/table
rename to snippets/html-mode/table
diff --git a/snippets/text-mode/html-mode/td b/snippets/html-mode/td
similarity index 100%
rename from snippets/text-mode/html-mode/td
rename to snippets/html-mode/td
diff --git a/snippets/text-mode/html-mode/textarea b/snippets/html-mode/textarea
similarity index 100%
rename from snippets/text-mode/html-mode/textarea
rename to snippets/html-mode/textarea
diff --git a/snippets/text-mode/html-mode/th b/snippets/html-mode/th
similarity index 100%
rename from snippets/text-mode/html-mode/th
rename to snippets/html-mode/th
diff --git a/snippets/text-mode/html-mode/title b/snippets/html-mode/title
similarity index 100%
rename from snippets/text-mode/html-mode/title
rename to snippets/html-mode/title
diff --git a/snippets/text-mode/html-mode/tr b/snippets/html-mode/tr
similarity index 100%
rename from snippets/text-mode/html-mode/tr
rename to snippets/html-mode/tr
diff --git a/snippets/text-mode/html-mode/ul b/snippets/html-mode/ul
similarity index 100%
rename from snippets/text-mode/html-mode/ul
rename to snippets/html-mode/ul
diff --git a/snippets/text-mode/html-mode/ul.class b/snippets/html-mode/ul.class
similarity index 100%
rename from snippets/text-mode/html-mode/ul.class
rename to snippets/html-mode/ul.class
diff --git a/snippets/text-mode/html-mode/ul.id b/snippets/html-mode/ul.id
similarity index 100%
rename from snippets/text-mode/html-mode/ul.id
rename to snippets/html-mode/ul.id
diff --git a/snippets/latex-mode/.yas-parents b/snippets/latex-mode/.yas-parents
new file mode 100644
index 0000000..eed5b44
--- /dev/null
+++ b/snippets/latex-mode/.yas-parents
@@ -0,0 +1 @@
+text-mode
diff --git a/snippets/text-mode/latex-mode/begin b/snippets/latex-mode/begin
similarity index 100%
rename from snippets/text-mode/latex-mode/begin
rename to snippets/latex-mode/begin
diff --git a/snippets/text-mode/markdown-mode/+ b/snippets/markdown-mode/+
similarity index 100%
rename from snippets/text-mode/markdown-mode/+
rename to snippets/markdown-mode/+
diff --git a/snippets/text-mode/markdown-mode/- b/snippets/markdown-mode/-
similarity index 100%
rename from snippets/text-mode/markdown-mode/-
rename to snippets/markdown-mode/-
diff --git a/snippets/markdown-mode/.yas-parents b/snippets/markdown-mode/.yas-parents
new file mode 100644
index 0000000..eed5b44
--- /dev/null
+++ b/snippets/markdown-mode/.yas-parents
@@ -0,0 +1 @@
+text-mode
diff --git a/snippets/text-mode/markdown-mode/_ b/snippets/markdown-mode/_
similarity index 100%
rename from snippets/text-mode/markdown-mode/_
rename to snippets/markdown-mode/_
diff --git a/snippets/text-mode/markdown-mode/__ b/snippets/markdown-mode/__
similarity index 100%
rename from snippets/text-mode/markdown-mode/__
rename to snippets/markdown-mode/__
diff --git a/snippets/text-mode/markdown-mode/` b/snippets/markdown-mode/`
similarity index 100%
rename from snippets/text-mode/markdown-mode/`
rename to snippets/markdown-mode/`
diff --git a/snippets/text-mode/markdown-mode/h1.1 b/snippets/markdown-mode/h1.1
similarity index 100%
rename from snippets/text-mode/markdown-mode/h1.1
rename to snippets/markdown-mode/h1.1
diff --git a/snippets/text-mode/markdown-mode/h1.2 b/snippets/markdown-mode/h1.2
similarity index 100%
rename from snippets/text-mode/markdown-mode/h1.2
rename to snippets/markdown-mode/h1.2
diff --git a/snippets/text-mode/markdown-mode/h2.1 b/snippets/markdown-mode/h2.1
similarity index 100%
rename from snippets/text-mode/markdown-mode/h2.1
rename to snippets/markdown-mode/h2.1
diff --git a/snippets/text-mode/markdown-mode/h2.2 b/snippets/markdown-mode/h2.2
similarity index 100%
rename from snippets/text-mode/markdown-mode/h2.2
rename to snippets/markdown-mode/h2.2
diff --git a/snippets/text-mode/markdown-mode/h3 b/snippets/markdown-mode/h3
similarity index 100%
rename from snippets/text-mode/markdown-mode/h3
rename to snippets/markdown-mode/h3
diff --git a/snippets/text-mode/markdown-mode/h4 b/snippets/markdown-mode/h4
similarity index 100%
rename from snippets/text-mode/markdown-mode/h4
rename to snippets/markdown-mode/h4
diff --git a/snippets/text-mode/markdown-mode/h5 b/snippets/markdown-mode/h5
similarity index 100%
rename from snippets/text-mode/markdown-mode/h5
rename to snippets/markdown-mode/h5
diff --git a/snippets/text-mode/markdown-mode/h6 b/snippets/markdown-mode/h6
similarity index 100%
rename from snippets/text-mode/markdown-mode/h6
rename to snippets/markdown-mode/h6
diff --git a/snippets/text-mode/markdown-mode/hr.1 b/snippets/markdown-mode/hr.1
similarity index 100%
rename from snippets/text-mode/markdown-mode/hr.1
rename to snippets/markdown-mode/hr.1
diff --git a/snippets/text-mode/markdown-mode/hr.2 b/snippets/markdown-mode/hr.2
similarity index 100%
rename from snippets/text-mode/markdown-mode/hr.2
rename to snippets/markdown-mode/hr.2
diff --git a/snippets/text-mode/markdown-mode/img b/snippets/markdown-mode/img
similarity index 100%
rename from snippets/text-mode/markdown-mode/img
rename to snippets/markdown-mode/img
diff --git a/snippets/text-mode/markdown-mode/link b/snippets/markdown-mode/link
similarity index 100%
rename from snippets/text-mode/markdown-mode/link
rename to snippets/markdown-mode/link
diff --git a/snippets/text-mode/markdown-mode/ol b/snippets/markdown-mode/ol
similarity index 100%
rename from snippets/text-mode/markdown-mode/ol
rename to snippets/markdown-mode/ol
diff --git a/snippets/text-mode/markdown-mode/rimg b/snippets/markdown-mode/rimg
similarity index 100%
rename from snippets/text-mode/markdown-mode/rimg
rename to snippets/markdown-mode/rimg
diff --git a/snippets/text-mode/markdown-mode/rlb b/snippets/markdown-mode/rlb
similarity index 100%
rename from snippets/text-mode/markdown-mode/rlb
rename to snippets/markdown-mode/rlb
diff --git a/snippets/text-mode/markdown-mode/rlink b/snippets/markdown-mode/rlink
similarity index 100%
rename from snippets/text-mode/markdown-mode/rlink
rename to snippets/markdown-mode/rlink
diff --git a/snippets/nxml-mode/.yas-parents b/snippets/nxml-mode/.yas-parents
new file mode 100644
index 0000000..eed5b44
--- /dev/null
+++ b/snippets/nxml-mode/.yas-parents
@@ -0,0 +1 @@
+text-mode
diff --git a/snippets/text-mode/nxml-mode/body b/snippets/nxml-mode/body
similarity index 100%
rename from snippets/text-mode/nxml-mode/body
rename to snippets/nxml-mode/body
diff --git a/snippets/text-mode/nxml-mode/br b/snippets/nxml-mode/br
similarity index 100%
rename from snippets/text-mode/nxml-mode/br
rename to snippets/nxml-mode/br
diff --git a/snippets/text-mode/nxml-mode/code b/snippets/nxml-mode/code
similarity index 100%
rename from snippets/text-mode/nxml-mode/code
rename to snippets/nxml-mode/code
diff --git a/snippets/text-mode/nxml-mode/div b/snippets/nxml-mode/div
similarity index 100%
rename from snippets/text-mode/nxml-mode/div
rename to snippets/nxml-mode/div
diff --git a/snippets/text-mode/nxml-mode/doctype b/snippets/nxml-mode/doctype
similarity index 100%
rename from snippets/text-mode/nxml-mode/doctype
rename to snippets/nxml-mode/doctype
diff --git a/snippets/text-mode/nxml-mode/doctype.xhtml1_strict b/snippets/nxml-mode/doctype.xhtml1_strict
similarity index 100%
rename from snippets/text-mode/nxml-mode/doctype.xhtml1_strict
rename to snippets/nxml-mode/doctype.xhtml1_strict
diff --git a/snippets/text-mode/nxml-mode/doctype.xhtml1_transitional b/snippets/nxml-mode/doctype.xhtml1_transitional
similarity index 100%
rename from snippets/text-mode/nxml-mode/doctype.xhtml1_transitional
rename to snippets/nxml-mode/doctype.xhtml1_transitional
diff --git a/snippets/text-mode/nxml-mode/form b/snippets/nxml-mode/form
similarity index 100%
rename from snippets/text-mode/nxml-mode/form
rename to snippets/nxml-mode/form
diff --git a/snippets/text-mode/nxml-mode/h1 b/snippets/nxml-mode/h1
similarity index 100%
rename from snippets/text-mode/nxml-mode/h1
rename to snippets/nxml-mode/h1
diff --git a/snippets/text-mode/nxml-mode/h2 b/snippets/nxml-mode/h2
similarity index 100%
rename from snippets/text-mode/nxml-mode/h2
rename to snippets/nxml-mode/h2
diff --git a/snippets/text-mode/nxml-mode/h3 b/snippets/nxml-mode/h3
similarity index 100%
rename from snippets/text-mode/nxml-mode/h3
rename to snippets/nxml-mode/h3
diff --git a/snippets/text-mode/nxml-mode/h4 b/snippets/nxml-mode/h4
similarity index 100%
rename from snippets/text-mode/nxml-mode/h4
rename to snippets/nxml-mode/h4
diff --git a/snippets/text-mode/nxml-mode/h5 b/snippets/nxml-mode/h5
similarity index 100%
rename from snippets/text-mode/nxml-mode/h5
rename to snippets/nxml-mode/h5
diff --git a/snippets/text-mode/nxml-mode/h6 b/snippets/nxml-mode/h6
similarity index 100%
rename from snippets/text-mode/nxml-mode/h6
rename to snippets/nxml-mode/h6
diff --git a/snippets/text-mode/nxml-mode/head b/snippets/nxml-mode/head
similarity index 100%
rename from snippets/text-mode/nxml-mode/head
rename to snippets/nxml-mode/head
diff --git a/snippets/text-mode/nxml-mode/hr b/snippets/nxml-mode/hr
similarity index 100%
rename from snippets/text-mode/nxml-mode/hr
rename to snippets/nxml-mode/hr
diff --git a/snippets/text-mode/nxml-mode/href b/snippets/nxml-mode/href
similarity index 100%
rename from snippets/text-mode/nxml-mode/href
rename to snippets/nxml-mode/href
diff --git a/snippets/text-mode/nxml-mode/html b/snippets/nxml-mode/html
similarity index 100%
rename from snippets/text-mode/nxml-mode/html
rename to snippets/nxml-mode/html
diff --git a/snippets/text-mode/nxml-mode/img b/snippets/nxml-mode/img
similarity index 100%
rename from snippets/text-mode/nxml-mode/img
rename to snippets/nxml-mode/img
diff --git a/snippets/text-mode/nxml-mode/input b/snippets/nxml-mode/input
similarity index 100%
rename from snippets/text-mode/nxml-mode/input
rename to snippets/nxml-mode/input
diff --git a/snippets/text-mode/nxml-mode/li b/snippets/nxml-mode/li
similarity index 100%
rename from snippets/text-mode/nxml-mode/li
rename to snippets/nxml-mode/li
diff --git a/snippets/text-mode/nxml-mode/link b/snippets/nxml-mode/link
similarity index 100%
rename from snippets/text-mode/nxml-mode/link
rename to snippets/nxml-mode/link
diff --git a/snippets/text-mode/nxml-mode/meta b/snippets/nxml-mode/meta
similarity index 100%
rename from snippets/text-mode/nxml-mode/meta
rename to snippets/nxml-mode/meta
diff --git a/snippets/text-mode/nxml-mode/name b/snippets/nxml-mode/name
similarity index 100%
rename from snippets/text-mode/nxml-mode/name
rename to snippets/nxml-mode/name
diff --git a/snippets/text-mode/nxml-mode/ol b/snippets/nxml-mode/ol
similarity index 100%
rename from snippets/text-mode/nxml-mode/ol
rename to snippets/nxml-mode/ol
diff --git a/snippets/text-mode/nxml-mode/p b/snippets/nxml-mode/p
similarity index 100%
rename from snippets/text-mode/nxml-mode/p
rename to snippets/nxml-mode/p
diff --git a/snippets/text-mode/nxml-mode/pre b/snippets/nxml-mode/pre
similarity index 100%
rename from snippets/text-mode/nxml-mode/pre
rename to snippets/nxml-mode/pre
diff --git a/snippets/text-mode/nxml-mode/quote b/snippets/nxml-mode/quote
similarity index 100%
rename from snippets/text-mode/nxml-mode/quote
rename to snippets/nxml-mode/quote
diff --git a/snippets/text-mode/nxml-mode/span b/snippets/nxml-mode/span
similarity index 100%
rename from snippets/text-mode/nxml-mode/span
rename to snippets/nxml-mode/span
diff --git a/snippets/text-mode/nxml-mode/style b/snippets/nxml-mode/style
similarity index 100%
rename from snippets/text-mode/nxml-mode/style
rename to snippets/nxml-mode/style
diff --git a/snippets/text-mode/nxml-mode/table b/snippets/nxml-mode/table
similarity index 100%
rename from snippets/text-mode/nxml-mode/table
rename to snippets/nxml-mode/table
diff --git a/snippets/text-mode/nxml-mode/tag.1l b/snippets/nxml-mode/tag.1l
similarity index 100%
rename from snippets/text-mode/nxml-mode/tag.1l
rename to snippets/nxml-mode/tag.1l
diff --git a/snippets/text-mode/nxml-mode/tag.2l b/snippets/nxml-mode/tag.2l
similarity index 100%
rename from snippets/text-mode/nxml-mode/tag.2l
rename to snippets/nxml-mode/tag.2l
diff --git a/snippets/text-mode/nxml-mode/td b/snippets/nxml-mode/td
similarity index 100%
rename from snippets/text-mode/nxml-mode/td
rename to snippets/nxml-mode/td
diff --git a/snippets/text-mode/nxml-mode/th b/snippets/nxml-mode/th
similarity index 100%
rename from snippets/text-mode/nxml-mode/th
rename to snippets/nxml-mode/th
diff --git a/snippets/text-mode/nxml-mode/title b/snippets/nxml-mode/title
similarity index 100%
rename from snippets/text-mode/nxml-mode/title
rename to snippets/nxml-mode/title
diff --git a/snippets/text-mode/nxml-mode/tr b/snippets/nxml-mode/tr
similarity index 100%
rename from snippets/text-mode/nxml-mode/tr
rename to snippets/nxml-mode/tr
diff --git a/snippets/text-mode/nxml-mode/ul b/snippets/nxml-mode/ul
similarity index 100%
rename from snippets/text-mode/nxml-mode/ul
rename to snippets/nxml-mode/ul
diff --git a/snippets/perl-mode/.yas-parents b/snippets/perl-mode/.yas-parents
new file mode 100644
index 0000000..eed5b44
--- /dev/null
+++ b/snippets/perl-mode/.yas-parents
@@ -0,0 +1 @@
+text-mode
diff --git a/snippets/text-mode/perl-mode/eval b/snippets/perl-mode/eval
similarity index 100%
rename from snippets/text-mode/perl-mode/eval
rename to snippets/perl-mode/eval
diff --git a/snippets/text-mode/perl-mode/for b/snippets/perl-mode/for
similarity index 100%
rename from snippets/text-mode/perl-mode/for
rename to snippets/perl-mode/for
diff --git a/snippets/text-mode/perl-mode/fore b/snippets/perl-mode/fore
similarity index 100%
rename from snippets/text-mode/perl-mode/fore
rename to snippets/perl-mode/fore
diff --git a/snippets/text-mode/perl-mode/if b/snippets/perl-mode/if
similarity index 100%
rename from snippets/text-mode/perl-mode/if
rename to snippets/perl-mode/if
diff --git a/snippets/text-mode/perl-mode/ife b/snippets/perl-mode/ife
similarity index 100%
rename from snippets/text-mode/perl-mode/ife
rename to snippets/perl-mode/ife
diff --git a/snippets/text-mode/perl-mode/ifee b/snippets/perl-mode/ifee
similarity index 100%
rename from snippets/text-mode/perl-mode/ifee
rename to snippets/perl-mode/ifee
diff --git a/snippets/text-mode/perl-mode/sub b/snippets/perl-mode/sub
similarity index 100%
rename from snippets/text-mode/perl-mode/sub
rename to snippets/perl-mode/sub
diff --git a/snippets/text-mode/perl-mode/unless b/snippets/perl-mode/unless
similarity index 100%
rename from snippets/text-mode/perl-mode/unless
rename to snippets/perl-mode/unless
diff --git a/snippets/text-mode/perl-mode/while b/snippets/perl-mode/while
similarity index 100%
rename from snippets/text-mode/perl-mode/while
rename to snippets/perl-mode/while
diff --git a/snippets/text-mode/perl-mode/xfore b/snippets/perl-mode/xfore
similarity index 100%
rename from snippets/text-mode/perl-mode/xfore
rename to snippets/perl-mode/xfore
diff --git a/snippets/text-mode/perl-mode/xif b/snippets/perl-mode/xif
similarity index 100%
rename from snippets/text-mode/perl-mode/xif
rename to snippets/perl-mode/xif
diff --git a/snippets/text-mode/perl-mode/xunless b/snippets/perl-mode/xunless
similarity index 100%
rename from snippets/text-mode/perl-mode/xunless
rename to snippets/perl-mode/xunless
diff --git a/snippets/text-mode/perl-mode/xwhile b/snippets/perl-mode/xwhile
similarity index 100%
rename from snippets/text-mode/perl-mode/xwhile
rename to snippets/perl-mode/xwhile
diff --git a/snippets/python-mode/.yas-parents b/snippets/python-mode/.yas-parents
new file mode 100644
index 0000000..eed5b44
--- /dev/null
+++ b/snippets/python-mode/.yas-parents
@@ -0,0 +1 @@
+text-mode
diff --git a/snippets/text-mode/python-mode/__ b/snippets/python-mode/__
similarity index 100%
rename from snippets/text-mode/python-mode/__
rename to snippets/python-mode/__
diff --git a/snippets/text-mode/python-mode/class b/snippets/python-mode/class
similarity index 100%
rename from snippets/text-mode/python-mode/class
rename to snippets/python-mode/class
diff --git a/snippets/text-mode/python-mode/def b/snippets/python-mode/def
similarity index 100%
rename from snippets/text-mode/python-mode/def
rename to snippets/python-mode/def
diff --git a/snippets/text-mode/python-mode/defm b/snippets/python-mode/defm
similarity index 100%
rename from snippets/text-mode/python-mode/defm
rename to snippets/python-mode/defm
diff --git a/snippets/text-mode/python-mode/for b/snippets/python-mode/for
similarity index 100%
rename from snippets/text-mode/python-mode/for
rename to snippets/python-mode/for
diff --git a/snippets/text-mode/python-mode/ifmain b/snippets/python-mode/ifmain
similarity index 100%
rename from snippets/text-mode/python-mode/ifmain
rename to snippets/python-mode/ifmain
diff --git a/snippets/text-mode/python-mode/prop b/snippets/python-mode/prop
similarity index 100%
rename from snippets/text-mode/python-mode/prop
rename to snippets/python-mode/prop
diff --git a/snippets/text-mode/python-mode/propg b/snippets/python-mode/propg
similarity index 100%
rename from snippets/text-mode/python-mode/propg
rename to snippets/python-mode/propg
diff --git a/snippets/text-mode/python-mode/propsg b/snippets/python-mode/propsg
similarity index 100%
rename from snippets/text-mode/python-mode/propsg
rename to snippets/python-mode/propsg
diff --git a/snippets/text-mode/python-mode/while b/snippets/python-mode/while
similarity index 100%
rename from snippets/text-mode/python-mode/while
rename to snippets/python-mode/while
diff --git a/snippets/rst-mode/.yas-parents b/snippets/rst-mode/.yas-parents
new file mode 100644
index 0000000..eed5b44
--- /dev/null
+++ b/snippets/rst-mode/.yas-parents
@@ -0,0 +1 @@
+text-mode
diff --git a/snippets/text-mode/rst-mode/chap b/snippets/rst-mode/chap
similarity index 100%
rename from snippets/text-mode/rst-mode/chap
rename to snippets/rst-mode/chap
diff --git a/snippets/text-mode/rst-mode/sec b/snippets/rst-mode/sec
similarity index 100%
rename from snippets/text-mode/rst-mode/sec
rename to snippets/rst-mode/sec
diff --git a/snippets/text-mode/rst-mode/tit b/snippets/rst-mode/tit
similarity index 100%
rename from snippets/text-mode/rst-mode/tit
rename to snippets/rst-mode/tit
diff --git a/snippets/text-mode/ruby-mode/# b/snippets/ruby-mode/#
similarity index 100%
rename from snippets/text-mode/ruby-mode/#
rename to snippets/ruby-mode/#
diff --git a/snippets/ruby-mode/.yas-parents b/snippets/ruby-mode/.yas-parents
new file mode 100644
index 0000000..eed5b44
--- /dev/null
+++ b/snippets/ruby-mode/.yas-parents
@@ -0,0 +1 @@
+text-mode
diff --git a/snippets/text-mode/ruby-mode/=b b/snippets/ruby-mode/=b
similarity index 100%
rename from snippets/text-mode/ruby-mode/=b
rename to snippets/ruby-mode/=b
diff --git a/snippets/text-mode/ruby-mode/Comp b/snippets/ruby-mode/Comp
similarity index 100%
rename from snippets/text-mode/ruby-mode/Comp
rename to snippets/ruby-mode/Comp
diff --git a/snippets/text-mode/ruby-mode/all b/snippets/ruby-mode/all
similarity index 100%
rename from snippets/text-mode/ruby-mode/all
rename to snippets/ruby-mode/all
diff --git a/snippets/text-mode/ruby-mode/am b/snippets/ruby-mode/am
similarity index 100%
rename from snippets/text-mode/ruby-mode/am
rename to snippets/ruby-mode/am
diff --git a/snippets/text-mode/ruby-mode/any b/snippets/ruby-mode/any
similarity index 100%
rename from snippets/text-mode/ruby-mode/any
rename to snippets/ruby-mode/any
diff --git a/snippets/text-mode/ruby-mode/app b/snippets/ruby-mode/app
similarity index 100%
rename from snippets/text-mode/ruby-mode/app
rename to snippets/ruby-mode/app
diff --git a/snippets/text-mode/ruby-mode/bm b/snippets/ruby-mode/bm
similarity index 100%
rename from snippets/text-mode/ruby-mode/bm
rename to snippets/ruby-mode/bm
diff --git a/snippets/text-mode/ruby-mode/case b/snippets/ruby-mode/case
similarity index 100%
rename from snippets/text-mode/ruby-mode/case
rename to snippets/ruby-mode/case
diff --git a/snippets/text-mode/ruby-mode/cla b/snippets/ruby-mode/cla
similarity index 100%
rename from snippets/text-mode/ruby-mode/cla
rename to snippets/ruby-mode/cla
diff --git a/snippets/text-mode/ruby-mode/classify b/snippets/ruby-mode/classify
similarity index 100%
rename from snippets/text-mode/ruby-mode/classify
rename to snippets/ruby-mode/classify
diff --git a/snippets/text-mode/ruby-mode/cls b/snippets/ruby-mode/cls
similarity index 100%
rename from snippets/text-mode/ruby-mode/cls
rename to snippets/ruby-mode/cls
diff --git a/snippets/text-mode/ruby-mode/collect b/snippets/ruby-mode/collect
similarity index 100%
rename from snippets/text-mode/ruby-mode/collect
rename to snippets/ruby-mode/collect
diff --git a/snippets/text-mode/ruby-mode/dee b/snippets/ruby-mode/dee
similarity index 100%
rename from snippets/text-mode/ruby-mode/dee
rename to snippets/ruby-mode/dee
diff --git a/snippets/text-mode/ruby-mode/deli b/snippets/ruby-mode/deli
similarity index 100%
rename from snippets/text-mode/ruby-mode/deli
rename to snippets/ruby-mode/deli
diff --git a/snippets/text-mode/ruby-mode/det b/snippets/ruby-mode/det
similarity index 100%
rename from snippets/text-mode/ruby-mode/det
rename to snippets/ruby-mode/det
diff --git a/snippets/text-mode/ruby-mode/dow b/snippets/ruby-mode/dow
similarity index 100%
rename from snippets/text-mode/ruby-mode/dow
rename to snippets/ruby-mode/dow
diff --git a/snippets/text-mode/ruby-mode/ea b/snippets/ruby-mode/ea
similarity index 100%
rename from snippets/text-mode/ruby-mode/ea
rename to snippets/ruby-mode/ea
diff --git a/snippets/text-mode/ruby-mode/eac b/snippets/ruby-mode/eac
similarity index 100%
rename from snippets/text-mode/ruby-mode/eac
rename to snippets/ruby-mode/eac
diff --git a/snippets/text-mode/ruby-mode/eai b/snippets/ruby-mode/eai
similarity index 100%
rename from snippets/text-mode/ruby-mode/eai
rename to snippets/ruby-mode/eai
diff --git a/snippets/text-mode/ruby-mode/eav b/snippets/ruby-mode/eav
similarity index 100%
rename from snippets/text-mode/ruby-mode/eav
rename to snippets/ruby-mode/eav
diff --git a/snippets/text-mode/ruby-mode/eawi b/snippets/ruby-mode/eawi
similarity index 100%
rename from snippets/text-mode/ruby-mode/eawi
rename to snippets/ruby-mode/eawi
diff --git a/snippets/text-mode/ruby-mode/forin b/snippets/ruby-mode/forin
similarity index 100%
rename from snippets/text-mode/ruby-mode/forin
rename to snippets/ruby-mode/forin
diff --git a/snippets/text-mode/ruby-mode/if b/snippets/ruby-mode/if
similarity index 100%
rename from snippets/text-mode/ruby-mode/if
rename to snippets/ruby-mode/if
diff --git a/snippets/text-mode/ruby-mode/ife b/snippets/ruby-mode/ife
similarity index 100%
rename from snippets/text-mode/ruby-mode/ife
rename to snippets/ruby-mode/ife
diff --git a/snippets/text-mode/ruby-mode/inject b/snippets/ruby-mode/inject
similarity index 100%
rename from snippets/text-mode/ruby-mode/inject
rename to snippets/ruby-mode/inject
diff --git a/snippets/text-mode/ruby-mode/mm b/snippets/ruby-mode/mm
similarity index 100%
rename from snippets/text-mode/ruby-mode/mm
rename to snippets/ruby-mode/mm
diff --git a/snippets/text-mode/ruby-mode/r b/snippets/ruby-mode/r
similarity index 100%
rename from snippets/text-mode/ruby-mode/r
rename to snippets/ruby-mode/r
diff --git a/snippets/text-mode/ruby-mode/rb b/snippets/ruby-mode/rb
similarity index 100%
rename from snippets/text-mode/ruby-mode/rb
rename to snippets/ruby-mode/rb
diff --git a/snippets/text-mode/ruby-mode/reject b/snippets/ruby-mode/reject
similarity index 100%
rename from snippets/text-mode/ruby-mode/reject
rename to snippets/ruby-mode/reject
diff --git a/snippets/text-mode/ruby-mode/req b/snippets/ruby-mode/req
similarity index 100%
rename from snippets/text-mode/ruby-mode/req
rename to snippets/ruby-mode/req
diff --git a/snippets/text-mode/ruby-mode/rreq b/snippets/ruby-mode/rreq
similarity index 100%
rename from snippets/text-mode/ruby-mode/rreq
rename to snippets/ruby-mode/rreq
diff --git a/snippets/text-mode/ruby-mode/rw b/snippets/ruby-mode/rw
similarity index 100%
rename from snippets/text-mode/ruby-mode/rw
rename to snippets/ruby-mode/rw
diff --git a/snippets/text-mode/ruby-mode/select b/snippets/ruby-mode/select
similarity index 100%
rename from snippets/text-mode/ruby-mode/select
rename to snippets/ruby-mode/select
diff --git a/snippets/text-mode/ruby-mode/tim b/snippets/ruby-mode/tim
similarity index 100%
rename from snippets/text-mode/ruby-mode/tim
rename to snippets/ruby-mode/tim
diff --git a/snippets/text-mode/ruby-mode/until b/snippets/ruby-mode/until
similarity index 100%
rename from snippets/text-mode/ruby-mode/until
rename to snippets/ruby-mode/until
diff --git a/snippets/text-mode/ruby-mode/upt b/snippets/ruby-mode/upt
similarity index 100%
rename from snippets/text-mode/ruby-mode/upt
rename to snippets/ruby-mode/upt
diff --git a/snippets/text-mode/ruby-mode/w b/snippets/ruby-mode/w
similarity index 100%
rename from snippets/text-mode/ruby-mode/w
rename to snippets/ruby-mode/w
diff --git a/snippets/text-mode/ruby-mode/when b/snippets/ruby-mode/when
similarity index 100%
rename from snippets/text-mode/ruby-mode/when
rename to snippets/ruby-mode/when
diff --git a/snippets/text-mode/ruby-mode/while b/snippets/ruby-mode/while
similarity index 100%
rename from snippets/text-mode/ruby-mode/while
rename to snippets/ruby-mode/while
diff --git a/snippets/text-mode/ruby-mode/y b/snippets/ruby-mode/y
similarity index 100%
rename from snippets/text-mode/ruby-mode/y
rename to snippets/ruby-mode/y
diff --git a/snippets/text-mode/ruby-mode/zip b/snippets/ruby-mode/zip
similarity index 100%
rename from snippets/text-mode/ruby-mode/zip
rename to snippets/ruby-mode/zip
diff --git a/snippets/scala-mode/.yas-parents b/snippets/scala-mode/.yas-parents
new file mode 100644
index 0000000..eed5b44
--- /dev/null
+++ b/snippets/scala-mode/.yas-parents
@@ -0,0 +1 @@
+text-mode
diff --git a/snippets/text-mode/scala-mode/act b/snippets/scala-mode/act
similarity index 100%
rename from snippets/text-mode/scala-mode/act
rename to snippets/scala-mode/act
diff --git a/snippets/text-mode/scala-mode/act.arg b/snippets/scala-mode/act.arg
similarity index 100%
rename from snippets/text-mode/scala-mode/act.arg
rename to snippets/scala-mode/act.arg
diff --git a/snippets/text-mode/scala-mode/actor b/snippets/scala-mode/actor
similarity index 100%
rename from snippets/text-mode/scala-mode/actor
rename to snippets/scala-mode/actor
diff --git a/snippets/text-mode/scala-mode/ano b/snippets/scala-mode/ano
similarity index 100%
rename from snippets/text-mode/scala-mode/ano
rename to snippets/scala-mode/ano
diff --git a/snippets/text-mode/scala-mode/app b/snippets/scala-mode/app
similarity index 100%
rename from snippets/text-mode/scala-mode/app
rename to snippets/scala-mode/app
diff --git a/snippets/text-mode/scala-mode/arr.new b/snippets/scala-mode/arr.new
similarity index 100%
rename from snippets/text-mode/scala-mode/arr.new
rename to snippets/scala-mode/arr.new
diff --git a/snippets/text-mode/scala-mode/arr.val-new b/snippets/scala-mode/arr.val-new
similarity index 100%
rename from snippets/text-mode/scala-mode/arr.val-new
rename to snippets/scala-mode/arr.val-new
diff --git a/snippets/text-mode/scala-mode/asof b/snippets/scala-mode/asof
similarity index 100%
rename from snippets/text-mode/scala-mode/asof
rename to snippets/scala-mode/asof
diff --git a/snippets/text-mode/scala-mode/ass b/snippets/scala-mode/ass
similarity index 100%
rename from snippets/text-mode/scala-mode/ass
rename to snippets/scala-mode/ass
diff --git a/snippets/text-mode/scala-mode/ass.true b/snippets/scala-mode/ass.true
similarity index 100%
rename from snippets/text-mode/scala-mode/ass.true
rename to snippets/scala-mode/ass.true
diff --git a/snippets/text-mode/scala-mode/at.author b/snippets/scala-mode/at.author
similarity index 100%
rename from snippets/text-mode/scala-mode/at.author
rename to snippets/scala-mode/at.author
diff --git a/snippets/text-mode/scala-mode/at.param b/snippets/scala-mode/at.param
similarity index 100%
rename from snippets/text-mode/scala-mode/at.param
rename to snippets/scala-mode/at.param
diff --git a/snippets/text-mode/scala-mode/at.return b/snippets/scala-mode/at.return
similarity index 100%
rename from snippets/text-mode/scala-mode/at.return
rename to snippets/scala-mode/at.return
diff --git a/snippets/text-mode/scala-mode/at.version b/snippets/scala-mode/at.version
similarity index 100%
rename from snippets/text-mode/scala-mode/at.version
rename to snippets/scala-mode/at.version
diff --git a/snippets/text-mode/scala-mode/bang b/snippets/scala-mode/bang
similarity index 100%
rename from snippets/text-mode/scala-mode/bang
rename to snippets/scala-mode/bang
diff --git a/snippets/text-mode/scala-mode/case b/snippets/scala-mode/case
similarity index 100%
rename from snippets/text-mode/scala-mode/case
rename to snippets/scala-mode/case
diff --git a/snippets/text-mode/scala-mode/case.match-all b/snippets/scala-mode/case.match-all
similarity index 100%
rename from snippets/text-mode/scala-mode/case.match-all
rename to snippets/scala-mode/case.match-all
diff --git a/snippets/text-mode/scala-mode/cast b/snippets/scala-mode/cast
similarity index 100%
rename from snippets/text-mode/scala-mode/cast
rename to snippets/scala-mode/cast
diff --git a/snippets/text-mode/scala-mode/cc b/snippets/scala-mode/cc
similarity index 100%
rename from snippets/text-mode/scala-mode/cc
rename to snippets/scala-mode/cc
diff --git a/snippets/text-mode/scala-mode/cl b/snippets/scala-mode/cl
similarity index 100%
rename from snippets/text-mode/scala-mode/cl
rename to snippets/scala-mode/cl
diff --git a/snippets/text-mode/scala-mode/cl.abs b/snippets/scala-mode/cl.abs
similarity index 100%
rename from snippets/text-mode/scala-mode/cl.abs
rename to snippets/scala-mode/cl.abs
diff --git a/snippets/text-mode/scala-mode/cl.abs-arg b/snippets/scala-mode/cl.abs-arg
similarity index 100%
rename from snippets/text-mode/scala-mode/cl.abs-arg
rename to snippets/scala-mode/cl.abs-arg
diff --git a/snippets/text-mode/scala-mode/cl.arg b/snippets/scala-mode/cl.arg
similarity index 100%
rename from snippets/text-mode/scala-mode/cl.arg
rename to snippets/scala-mode/cl.arg
diff --git a/snippets/text-mode/scala-mode/clof b/snippets/scala-mode/clof
similarity index 100%
rename from snippets/text-mode/scala-mode/clof
rename to snippets/scala-mode/clof
diff --git a/snippets/text-mode/scala-mode/co b/snippets/scala-mode/co
similarity index 100%
rename from snippets/text-mode/scala-mode/co
rename to snippets/scala-mode/co
diff --git a/snippets/text-mode/scala-mode/cons b/snippets/scala-mode/cons
similarity index 100%
rename from snippets/text-mode/scala-mode/cons
rename to snippets/scala-mode/cons
diff --git a/snippets/text-mode/scala-mode/cons.nil b/snippets/scala-mode/cons.nil
similarity index 100%
rename from snippets/text-mode/scala-mode/cons.nil
rename to snippets/scala-mode/cons.nil
diff --git a/snippets/text-mode/scala-mode/def.arg b/snippets/scala-mode/def.arg
similarity index 100%
rename from snippets/text-mode/scala-mode/def.arg
rename to snippets/scala-mode/def.arg
diff --git a/snippets/text-mode/scala-mode/def.arg-body b/snippets/scala-mode/def.arg-body
similarity index 100%
rename from snippets/text-mode/scala-mode/def.arg-body
rename to snippets/scala-mode/def.arg-body
diff --git a/snippets/text-mode/scala-mode/def.arg-ret b/snippets/scala-mode/def.arg-ret
similarity index 100%
rename from snippets/text-mode/scala-mode/def.arg-ret
rename to snippets/scala-mode/def.arg-ret
diff --git a/snippets/text-mode/scala-mode/def.arg-ret-body b/snippets/scala-mode/def.arg-ret-body
similarity index 100%
rename from snippets/text-mode/scala-mode/def.arg-ret-body
rename to snippets/scala-mode/def.arg-ret-body
diff --git a/snippets/text-mode/scala-mode/def.body b/snippets/scala-mode/def.body
similarity index 100%
rename from snippets/text-mode/scala-mode/def.body
rename to snippets/scala-mode/def.body
diff --git a/snippets/text-mode/scala-mode/def.ret b/snippets/scala-mode/def.ret
similarity index 100%
rename from snippets/text-mode/scala-mode/def.ret
rename to snippets/scala-mode/def.ret
diff --git a/snippets/text-mode/scala-mode/def.ret-body b/snippets/scala-mode/def.ret-body
similarity index 100%
rename from snippets/text-mode/scala-mode/def.ret-body
rename to snippets/scala-mode/def.ret-body
diff --git a/snippets/text-mode/scala-mode/def.simple b/snippets/scala-mode/def.simple
similarity index 100%
rename from snippets/text-mode/scala-mode/def.simple
rename to snippets/scala-mode/def.simple
diff --git a/snippets/text-mode/scala-mode/doc.class b/snippets/scala-mode/doc.class
similarity index 100%
rename from snippets/text-mode/scala-mode/doc.class
rename to snippets/scala-mode/doc.class
diff --git a/snippets/text-mode/scala-mode/doc.def b/snippets/scala-mode/doc.def
similarity index 100%
rename from snippets/text-mode/scala-mode/doc.def
rename to snippets/scala-mode/doc.def
diff --git a/snippets/text-mode/scala-mode/doc.file b/snippets/scala-mode/doc.file
similarity index 100%
rename from snippets/text-mode/scala-mode/doc.file
rename to snippets/scala-mode/doc.file
diff --git a/snippets/text-mode/scala-mode/doc.file-scala b/snippets/scala-mode/doc.file-scala
similarity index 100%
rename from snippets/text-mode/scala-mode/doc.file-scala
rename to snippets/scala-mode/doc.file-scala
diff --git a/snippets/text-mode/scala-mode/doc.file-scala-api b/snippets/scala-mode/doc.file-scala-api
similarity index 100%
rename from snippets/text-mode/scala-mode/doc.file-scala-api
rename to snippets/scala-mode/doc.file-scala-api
diff --git a/snippets/text-mode/scala-mode/doc.scaladoc b/snippets/scala-mode/doc.scaladoc
similarity index 100%
rename from snippets/text-mode/scala-mode/doc.scaladoc
rename to snippets/scala-mode/doc.scaladoc
diff --git a/snippets/text-mode/scala-mode/expect b/snippets/scala-mode/expect
similarity index 100%
rename from snippets/text-mode/scala-mode/expect
rename to snippets/scala-mode/expect
diff --git a/snippets/text-mode/scala-mode/ext b/snippets/scala-mode/ext
similarity index 100%
rename from snippets/text-mode/scala-mode/ext
rename to snippets/scala-mode/ext
diff --git a/snippets/text-mode/scala-mode/for.extract b/snippets/scala-mode/for.extract
similarity index 100%
rename from snippets/text-mode/scala-mode/for.extract
rename to snippets/scala-mode/for.extract
diff --git a/snippets/text-mode/scala-mode/for.if b/snippets/scala-mode/for.if
similarity index 100%
rename from snippets/text-mode/scala-mode/for.if
rename to snippets/scala-mode/for.if
diff --git a/snippets/text-mode/scala-mode/for.loop b/snippets/scala-mode/for.loop
similarity index 100%
rename from snippets/text-mode/scala-mode/for.loop
rename to snippets/scala-mode/for.loop
diff --git a/snippets/text-mode/scala-mode/for.multi b/snippets/scala-mode/for.multi
similarity index 100%
rename from snippets/text-mode/scala-mode/for.multi
rename to snippets/scala-mode/for.multi
diff --git a/snippets/text-mode/scala-mode/foreach b/snippets/scala-mode/foreach
similarity index 100%
rename from snippets/text-mode/scala-mode/foreach
rename to snippets/scala-mode/foreach
diff --git a/snippets/text-mode/scala-mode/hmap.new b/snippets/scala-mode/hmap.new
similarity index 100%
rename from snippets/text-mode/scala-mode/hmap.new
rename to snippets/scala-mode/hmap.new
diff --git a/snippets/text-mode/scala-mode/hmap.val-new b/snippets/scala-mode/hmap.val-new
similarity index 100%
rename from snippets/text-mode/scala-mode/hmap.val-new
rename to snippets/scala-mode/hmap.val-new
diff --git a/snippets/text-mode/scala-mode/hset.new b/snippets/scala-mode/hset.new
similarity index 100%
rename from snippets/text-mode/scala-mode/hset.new
rename to snippets/scala-mode/hset.new
diff --git a/snippets/text-mode/scala-mode/hset.val-new b/snippets/scala-mode/hset.val-new
similarity index 100%
rename from snippets/text-mode/scala-mode/hset.val-new
rename to snippets/scala-mode/hset.val-new
diff --git a/snippets/text-mode/scala-mode/if b/snippets/scala-mode/if
similarity index 100%
rename from snippets/text-mode/scala-mode/if
rename to snippets/scala-mode/if
diff --git a/snippets/text-mode/scala-mode/if.else b/snippets/scala-mode/if.else
similarity index 100%
rename from snippets/text-mode/scala-mode/if.else
rename to snippets/scala-mode/if.else
diff --git a/snippets/text-mode/scala-mode/imp b/snippets/scala-mode/imp
similarity index 100%
rename from snippets/text-mode/scala-mode/imp
rename to snippets/scala-mode/imp
diff --git a/snippets/text-mode/scala-mode/intercept b/snippets/scala-mode/intercept
similarity index 100%
rename from snippets/text-mode/scala-mode/intercept
rename to snippets/scala-mode/intercept
diff --git a/snippets/text-mode/scala-mode/isof b/snippets/scala-mode/isof
similarity index 100%
rename from snippets/text-mode/scala-mode/isof
rename to snippets/scala-mode/isof
diff --git a/snippets/text-mode/scala-mode/ls.new b/snippets/scala-mode/ls.new
similarity index 100%
rename from snippets/text-mode/scala-mode/ls.new
rename to snippets/scala-mode/ls.new
diff --git a/snippets/text-mode/scala-mode/ls.val-new b/snippets/scala-mode/ls.val-new
similarity index 100%
rename from snippets/text-mode/scala-mode/ls.val-new
rename to snippets/scala-mode/ls.val-new
diff --git a/snippets/text-mode/scala-mode/main b/snippets/scala-mode/main
similarity index 100%
rename from snippets/text-mode/scala-mode/main
rename to snippets/scala-mode/main
diff --git a/snippets/text-mode/scala-mode/map b/snippets/scala-mode/map
similarity index 100%
rename from snippets/text-mode/scala-mode/map
rename to snippets/scala-mode/map
diff --git a/snippets/text-mode/scala-mode/map.new b/snippets/scala-mode/map.new
similarity index 100%
rename from snippets/text-mode/scala-mode/map.new
rename to snippets/scala-mode/map.new
diff --git a/snippets/text-mode/scala-mode/match b/snippets/scala-mode/match
similarity index 100%
rename from snippets/text-mode/scala-mode/match
rename to snippets/scala-mode/match
diff --git a/snippets/text-mode/scala-mode/match.can b/snippets/scala-mode/match.can
similarity index 100%
rename from snippets/text-mode/scala-mode/match.can
rename to snippets/scala-mode/match.can
diff --git a/snippets/text-mode/scala-mode/match.option b/snippets/scala-mode/match.option
similarity index 100%
rename from snippets/text-mode/scala-mode/match.option
rename to snippets/scala-mode/match.option
diff --git a/snippets/text-mode/scala-mode/mix b/snippets/scala-mode/mix
similarity index 100%
rename from snippets/text-mode/scala-mode/mix
rename to snippets/scala-mode/mix
diff --git a/snippets/text-mode/scala-mode/ob b/snippets/scala-mode/ob
similarity index 100%
rename from snippets/text-mode/scala-mode/ob
rename to snippets/scala-mode/ob
diff --git a/snippets/text-mode/scala-mode/pac b/snippets/scala-mode/pac
similarity index 100%
rename from snippets/text-mode/scala-mode/pac
rename to snippets/scala-mode/pac
diff --git a/snippets/text-mode/scala-mode/pr.newline b/snippets/scala-mode/pr.newline
similarity index 100%
rename from snippets/text-mode/scala-mode/pr.newline
rename to snippets/scala-mode/pr.newline
diff --git a/snippets/text-mode/scala-mode/pr.simple b/snippets/scala-mode/pr.simple
similarity index 100%
rename from snippets/text-mode/scala-mode/pr.simple
rename to snippets/scala-mode/pr.simple
diff --git a/snippets/text-mode/scala-mode/pr.string b/snippets/scala-mode/pr.string
similarity index 100%
rename from snippets/text-mode/scala-mode/pr.string
rename to snippets/scala-mode/pr.string
diff --git a/snippets/text-mode/scala-mode/pr.trace b/snippets/scala-mode/pr.trace
similarity index 100%
rename from snippets/text-mode/scala-mode/pr.trace
rename to snippets/scala-mode/pr.trace
diff --git a/snippets/text-mode/scala-mode/pri b/snippets/scala-mode/pri
similarity index 100%
rename from snippets/text-mode/scala-mode/pri
rename to snippets/scala-mode/pri
diff --git a/snippets/text-mode/scala-mode/pri.param b/snippets/scala-mode/pri.param
similarity index 100%
rename from snippets/text-mode/scala-mode/pri.param
rename to snippets/scala-mode/pri.param
diff --git a/snippets/text-mode/scala-mode/pro b/snippets/scala-mode/pro
similarity index 100%
rename from snippets/text-mode/scala-mode/pro
rename to snippets/scala-mode/pro
diff --git a/snippets/text-mode/scala-mode/pro.param b/snippets/scala-mode/pro.param
similarity index 100%
rename from snippets/text-mode/scala-mode/pro.param
rename to snippets/scala-mode/pro.param
diff --git a/snippets/text-mode/scala-mode/suite b/snippets/scala-mode/suite
similarity index 100%
rename from snippets/text-mode/scala-mode/suite
rename to snippets/scala-mode/suite
diff --git a/snippets/text-mode/scala-mode/test b/snippets/scala-mode/test
similarity index 100%
rename from snippets/text-mode/scala-mode/test
rename to snippets/scala-mode/test
diff --git a/snippets/text-mode/scala-mode/throw b/snippets/scala-mode/throw
similarity index 100%
rename from snippets/text-mode/scala-mode/throw
rename to snippets/scala-mode/throw
diff --git a/snippets/text-mode/scala-mode/tr b/snippets/scala-mode/tr
similarity index 100%
rename from snippets/text-mode/scala-mode/tr
rename to snippets/scala-mode/tr
diff --git a/snippets/text-mode/scala-mode/tr.ext b/snippets/scala-mode/tr.ext
similarity index 100%
rename from snippets/text-mode/scala-mode/tr.ext
rename to snippets/scala-mode/tr.ext
diff --git a/snippets/text-mode/scala-mode/tr.ext-with b/snippets/scala-mode/tr.ext-with
similarity index 100%
rename from snippets/text-mode/scala-mode/tr.ext-with
rename to snippets/scala-mode/tr.ext-with
diff --git a/snippets/text-mode/scala-mode/tr.with b/snippets/scala-mode/tr.with
similarity index 100%
rename from snippets/text-mode/scala-mode/tr.with
rename to snippets/scala-mode/tr.with
diff --git a/snippets/text-mode/scala-mode/try b/snippets/scala-mode/try
similarity index 100%
rename from snippets/text-mode/scala-mode/try
rename to snippets/scala-mode/try
diff --git a/snippets/text-mode/scala-mode/try.catch-finally b/snippets/scala-mode/try.catch-finally
similarity index 100%
rename from snippets/text-mode/scala-mode/try.catch-finally
rename to snippets/scala-mode/try.catch-finally
diff --git a/snippets/text-mode/scala-mode/try.finally b/snippets/scala-mode/try.finally
similarity index 100%
rename from snippets/text-mode/scala-mode/try.finally
rename to snippets/scala-mode/try.finally
diff --git a/snippets/text-mode/scala-mode/tup.arrow b/snippets/scala-mode/tup.arrow
similarity index 100%
rename from snippets/text-mode/scala-mode/tup.arrow
rename to snippets/scala-mode/tup.arrow
diff --git a/snippets/text-mode/scala-mode/tup.paren b/snippets/scala-mode/tup.paren
similarity index 100%
rename from snippets/text-mode/scala-mode/tup.paren
rename to snippets/scala-mode/tup.paren
diff --git a/snippets/text-mode/scala-mode/val b/snippets/scala-mode/val
similarity index 100%
rename from snippets/text-mode/scala-mode/val
rename to snippets/scala-mode/val
diff --git a/snippets/text-mode/scala-mode/val.new b/snippets/scala-mode/val.new
similarity index 100%
rename from snippets/text-mode/scala-mode/val.new
rename to snippets/scala-mode/val.new
diff --git a/snippets/text-mode/scala-mode/val.ret b/snippets/scala-mode/val.ret
similarity index 100%
rename from snippets/text-mode/scala-mode/val.ret
rename to snippets/scala-mode/val.ret
diff --git a/snippets/text-mode/scala-mode/var b/snippets/scala-mode/var
similarity index 100%
rename from snippets/text-mode/scala-mode/var
rename to snippets/scala-mode/var
diff --git a/snippets/text-mode/scala-mode/var.new b/snippets/scala-mode/var.new
similarity index 100%
rename from snippets/text-mode/scala-mode/var.new
rename to snippets/scala-mode/var.new
diff --git a/snippets/text-mode/scala-mode/var.ret b/snippets/scala-mode/var.ret
similarity index 100%
rename from snippets/text-mode/scala-mode/var.ret
rename to snippets/scala-mode/var.ret
diff --git a/snippets/text-mode/scala-mode/whi b/snippets/scala-mode/whi
similarity index 100%
rename from snippets/text-mode/scala-mode/whi
rename to snippets/scala-mode/whi
diff --git a/snippets/text-mode/scala-mode/with b/snippets/scala-mode/with
similarity index 100%
rename from snippets/text-mode/scala-mode/with
rename to snippets/scala-mode/with
diff --git a/snippets/snippet-mode/.yas-parents b/snippets/snippet-mode/.yas-parents
new file mode 100644
index 0000000..eed5b44
--- /dev/null
+++ b/snippets/snippet-mode/.yas-parents
@@ -0,0 +1 @@
+text-mode
diff --git a/snippets/text-mode/snippet-mode/field b/snippets/snippet-mode/field
similarity index 100%
rename from snippets/text-mode/snippet-mode/field
rename to snippets/snippet-mode/field
diff --git a/snippets/text-mode/snippet-mode/mirror b/snippets/snippet-mode/mirror
similarity index 100%
rename from snippets/text-mode/snippet-mode/mirror
rename to snippets/snippet-mode/mirror
diff --git a/snippets/text-mode/snippet-mode/vars b/snippets/snippet-mode/vars
similarity index 100%
rename from snippets/text-mode/snippet-mode/vars
rename to snippets/snippet-mode/vars
diff --git a/snippets/sql-mode/.yas-parents b/snippets/sql-mode/.yas-parents
new file mode 100644
index 0000000..eed5b44
--- /dev/null
+++ b/snippets/sql-mode/.yas-parents
@@ -0,0 +1 @@
+text-mode
diff --git a/snippets/text-mode/sql-mode/column b/snippets/sql-mode/column
similarity index 100%
rename from snippets/text-mode/sql-mode/column
rename to snippets/sql-mode/column
diff --git a/snippets/text-mode/sql-mode/constraint b/snippets/sql-mode/constraint
similarity index 100%
rename from snippets/text-mode/sql-mode/constraint
rename to snippets/sql-mode/constraint
diff --git a/snippets/text-mode/sql-mode/constraint.1 b/snippets/sql-mode/constraint.1
similarity index 100%
rename from snippets/text-mode/sql-mode/constraint.1
rename to snippets/sql-mode/constraint.1
diff --git a/snippets/text-mode/sql-mode/create b/snippets/sql-mode/create
similarity index 100%
rename from snippets/text-mode/sql-mode/create
rename to snippets/sql-mode/create
diff --git a/snippets/text-mode/sql-mode/create.1 b/snippets/sql-mode/create.1
similarity index 100%
rename from snippets/text-mode/sql-mode/create.1
rename to snippets/sql-mode/create.1
diff --git a/snippets/text-mode/sql-mode/references b/snippets/sql-mode/references
similarity index 100%
rename from snippets/text-mode/sql-mode/references
rename to snippets/sql-mode/references