diff --git a/snippets/ruby-mode/all b/snippets/ruby-mode/collections/all
similarity index 100%
rename from snippets/ruby-mode/all
rename to snippets/ruby-mode/collections/all
diff --git a/snippets/ruby-mode/any b/snippets/ruby-mode/collections/any
similarity index 100%
rename from snippets/ruby-mode/any
rename to snippets/ruby-mode/collections/any
diff --git a/snippets/ruby-mode/classify b/snippets/ruby-mode/collections/classify
similarity index 100%
rename from snippets/ruby-mode/classify
rename to snippets/ruby-mode/collections/classify
diff --git a/snippets/ruby-mode/collect b/snippets/ruby-mode/collections/collect
similarity index 100%
rename from snippets/ruby-mode/collect
rename to snippets/ruby-mode/collections/collect
diff --git a/snippets/ruby-mode/deli b/snippets/ruby-mode/collections/deli
similarity index 100%
rename from snippets/ruby-mode/deli
rename to snippets/ruby-mode/collections/deli
diff --git a/snippets/ruby-mode/det b/snippets/ruby-mode/collections/det
similarity index 100%
rename from snippets/ruby-mode/det
rename to snippets/ruby-mode/collections/det
diff --git a/snippets/ruby-mode/ea b/snippets/ruby-mode/collections/ea
similarity index 100%
rename from snippets/ruby-mode/ea
rename to snippets/ruby-mode/collections/ea
diff --git a/snippets/ruby-mode/eac b/snippets/ruby-mode/collections/eac
similarity index 100%
rename from snippets/ruby-mode/eac
rename to snippets/ruby-mode/collections/eac
diff --git a/snippets/ruby-mode/eai b/snippets/ruby-mode/collections/eai
similarity index 100%
rename from snippets/ruby-mode/eai
rename to snippets/ruby-mode/collections/eai
diff --git a/snippets/ruby-mode/eav b/snippets/ruby-mode/collections/eav
similarity index 100%
rename from snippets/ruby-mode/eav
rename to snippets/ruby-mode/collections/eav
diff --git a/snippets/ruby-mode/eawi b/snippets/ruby-mode/collections/eawi
similarity index 100%
rename from snippets/ruby-mode/eawi
rename to snippets/ruby-mode/collections/eawi
diff --git a/snippets/ruby-mode/inject b/snippets/ruby-mode/collections/inject
similarity index 100%
rename from snippets/ruby-mode/inject
rename to snippets/ruby-mode/collections/inject
diff --git a/snippets/ruby-mode/reject b/snippets/ruby-mode/collections/reject
similarity index 100%
rename from snippets/ruby-mode/reject
rename to snippets/ruby-mode/collections/reject
diff --git a/snippets/ruby-mode/select b/snippets/ruby-mode/collections/select
similarity index 100%
rename from snippets/ruby-mode/select
rename to snippets/ruby-mode/collections/select
diff --git a/snippets/ruby-mode/zip b/snippets/ruby-mode/collections/zip
similarity index 100%
rename from snippets/ruby-mode/zip
rename to snippets/ruby-mode/collections/zip
diff --git a/snippets/ruby-mode/forin b/snippets/ruby-mode/control structure/forin
similarity index 100%
rename from snippets/ruby-mode/forin
rename to snippets/ruby-mode/control structure/forin
diff --git a/snippets/ruby-mode/if b/snippets/ruby-mode/control structure/if
similarity index 100%
rename from snippets/ruby-mode/if
rename to snippets/ruby-mode/control structure/if
diff --git a/snippets/ruby-mode/ife b/snippets/ruby-mode/control structure/ife
similarity index 100%
rename from snippets/ruby-mode/ife
rename to snippets/ruby-mode/control structure/ife
diff --git a/snippets/ruby-mode/tim b/snippets/ruby-mode/control structure/tim
similarity index 100%
rename from snippets/ruby-mode/tim
rename to snippets/ruby-mode/control structure/tim
diff --git a/snippets/ruby-mode/until b/snippets/ruby-mode/control structure/until
similarity index 100%
rename from snippets/ruby-mode/until
rename to snippets/ruby-mode/control structure/until
diff --git a/snippets/ruby-mode/upt b/snippets/ruby-mode/control structure/upt
similarity index 100%
rename from snippets/ruby-mode/upt
rename to snippets/ruby-mode/control structure/upt
diff --git a/snippets/ruby-mode/when b/snippets/ruby-mode/control structure/when
similarity index 100%
rename from snippets/ruby-mode/when
rename to snippets/ruby-mode/control structure/when
diff --git a/snippets/ruby-mode/while b/snippets/ruby-mode/control structure/while
similarity index 100%
rename from snippets/ruby-mode/while
rename to snippets/ruby-mode/control structure/while
diff --git a/snippets/ruby-mode/Comp b/snippets/ruby-mode/definitions/Comp
similarity index 100%
rename from snippets/ruby-mode/Comp
rename to snippets/ruby-mode/definitions/Comp
diff --git a/snippets/ruby-mode/am b/snippets/ruby-mode/definitions/am
similarity index 100%
rename from snippets/ruby-mode/am
rename to snippets/ruby-mode/definitions/am
diff --git a/snippets/ruby-mode/cla b/snippets/ruby-mode/definitions/cla
similarity index 100%
rename from snippets/ruby-mode/cla
rename to snippets/ruby-mode/definitions/cla
diff --git a/snippets/ruby-mode/cls b/snippets/ruby-mode/definitions/cls
similarity index 100%
rename from snippets/ruby-mode/cls
rename to snippets/ruby-mode/definitions/cls
diff --git a/snippets/ruby-mode/mm b/snippets/ruby-mode/definitions/mm
similarity index 100%
rename from snippets/ruby-mode/mm
rename to snippets/ruby-mode/definitions/mm
diff --git a/snippets/ruby-mode/r b/snippets/ruby-mode/definitions/r
similarity index 100%
rename from snippets/ruby-mode/r
rename to snippets/ruby-mode/definitions/r
diff --git a/snippets/ruby-mode/rw b/snippets/ruby-mode/definitions/rw
similarity index 100%
rename from snippets/ruby-mode/rw
rename to snippets/ruby-mode/definitions/rw
diff --git a/snippets/ruby-mode/w b/snippets/ruby-mode/definitions/w
similarity index 100%
rename from snippets/ruby-mode/w
rename to snippets/ruby-mode/definitions/w
diff --git a/snippets/ruby-mode/dow b/snippets/ruby-mode/dow
deleted file mode 100644
index 3b65271..0000000
--- a/snippets/ruby-mode/dow
+++ /dev/null
@@ -1,6 +0,0 @@
-#name : downto(...) { |n| ... }
-#group : control structure
-# --
-downto(${0}) { |${n}|
-  $0
-}
\ No newline at end of file
diff --git a/snippets/ruby-mode/# b/snippets/ruby-mode/general/#
similarity index 100%
rename from snippets/ruby-mode/#
rename to snippets/ruby-mode/general/#
diff --git a/snippets/ruby-mode/=b b/snippets/ruby-mode/general/=b
similarity index 100%
rename from snippets/ruby-mode/=b
rename to snippets/ruby-mode/general/=b
diff --git a/snippets/ruby-mode/app b/snippets/ruby-mode/general/app
similarity index 100%
rename from snippets/ruby-mode/app
rename to snippets/ruby-mode/general/app
diff --git a/snippets/ruby-mode/bm b/snippets/ruby-mode/general/bm
similarity index 100%
rename from snippets/ruby-mode/bm
rename to snippets/ruby-mode/general/bm
diff --git a/snippets/ruby-mode/case b/snippets/ruby-mode/general/case
similarity index 100%
rename from snippets/ruby-mode/case
rename to snippets/ruby-mode/general/case
diff --git a/snippets/ruby-mode/dee b/snippets/ruby-mode/general/dee
similarity index 100%
rename from snippets/ruby-mode/dee
rename to snippets/ruby-mode/general/dee
diff --git a/snippets/ruby-mode/rb b/snippets/ruby-mode/general/rb
similarity index 100%
rename from snippets/ruby-mode/rb
rename to snippets/ruby-mode/general/rb
diff --git a/snippets/ruby-mode/req b/snippets/ruby-mode/general/req
similarity index 100%
rename from snippets/ruby-mode/req
rename to snippets/ruby-mode/general/req
diff --git a/snippets/ruby-mode/rreq b/snippets/ruby-mode/general/rreq
similarity index 100%
rename from snippets/ruby-mode/rreq
rename to snippets/ruby-mode/general/rreq
diff --git a/snippets/ruby-mode/y b/snippets/ruby-mode/general/y
similarity index 100%
rename from snippets/ruby-mode/y
rename to snippets/ruby-mode/general/y