diff --git a/custom-variables.el b/custom-variables.el
index 4d8f11e..93098a4 100644
--- a/custom-variables.el
+++ b/custom-variables.el
@@ -54,7 +54,7 @@
  '(whitespace-action nil)
  '(winner-mode t nil (winner))
  '(yas/global-mode t nil (yasnippet))
- '(yas/snippet-dirs (quote ("~/.emacs.d/snippets/custom" "~/.emacs.d/snippets/stock" "~/.emacs.d/el-get/yasnippet/snippets")) nil (yasnippet))
+ '(yas/snippet-dirs (quote ("~/.emacs.d/snippets" "~/.emacs.d/el-get/yasnippet/snippets")) nil (yasnippet))
  '(yas/use-menu t))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
diff --git a/snippets/custom/ruby-mode/collections/each b/snippets/custom/ruby-mode/collections/each
deleted file mode 100644
index c779dd6..0000000
--- a/snippets/custom/ruby-mode/collections/each
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : each { |...| ... }
-# --
-each { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/custom/ruby-mode/collections/eachwi b/snippets/custom/ruby-mode/collections/eachwi
deleted file mode 100644
index 3d03998..0000000
--- a/snippets/custom/ruby-mode/collections/eachwi
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : each_with_index { |e, i| ... }
-# --
-each_with_index { |${e}, ${i}| $0 }
\ No newline at end of file
diff --git a/snippets/custom/ruby-mode/collections/map b/snippets/custom/ruby-mode/collections/map
deleted file mode 100644
index e561e5a..0000000
--- a/snippets/custom/ruby-mode/collections/map
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : map { |...| ... }
-# --
-map { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/custom/ruby-mode/collections/mapwi b/snippets/custom/ruby-mode/collections/mapwi
deleted file mode 100644
index 9c0ae82..0000000
--- a/snippets/custom/ruby-mode/collections/mapwi
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : map_with_index { |...| ... }
-# --
-map_with_index { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/custom/ruby-mode/control structure/else b/snippets/custom/ruby-mode/control structure/else
deleted file mode 100644
index cb4ff85..0000000
--- a/snippets/custom/ruby-mode/control structure/else	
+++ /dev/null
@@ -1,4 +0,0 @@
-#name: else
-# --
-else
-  $0
\ No newline at end of file
diff --git a/snippets/custom/ruby-mode/definitions/clas b/snippets/custom/ruby-mode/definitions/clas
deleted file mode 100644
index c8f3524..0000000
--- a/snippets/custom/ruby-mode/definitions/clas
+++ /dev/null
@@ -1,5 +0,0 @@
-#name : class << self ... end
-# --
-class << ${self}
-  $0
-end
\ No newline at end of file
diff --git a/snippets/custom/ruby-mode/definitions/do b/snippets/custom/ruby-mode/definitions/do
deleted file mode 100644
index 36646dd..0000000
--- a/snippets/custom/ruby-mode/definitions/do
+++ /dev/null
@@ -1,5 +0,0 @@
-#name : do |variable| ... end
-# --
-do $1
-  $0
-end
\ No newline at end of file
diff --git a/snippets/custom/ruby-mode/general/Given b/snippets/custom/ruby-mode/general/Given
deleted file mode 100644
index df9fc67..0000000
--- a/snippets/custom/ruby-mode/general/Given
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : Given(...)
-# --
-Given(/^${1:match}$/)$0
\ No newline at end of file
diff --git a/snippets/custom/ruby-mode/general/Then b/snippets/custom/ruby-mode/general/Then
deleted file mode 100644
index 70ed053..0000000
--- a/snippets/custom/ruby-mode/general/Then
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : Then(...)
-# --
-Then(/^${1:match}$/)$0
\ No newline at end of file
diff --git a/snippets/custom/ruby-mode/general/When b/snippets/custom/ruby-mode/general/When
deleted file mode 100644
index b0c7133..0000000
--- a/snippets/custom/ruby-mode/general/When
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : When(...)
-# --
-When(/^${1:match}$/)$0
\ No newline at end of file
diff --git a/snippets/custom/ruby-mode/general/re b/snippets/custom/ruby-mode/general/re
deleted file mode 100644
index 6c01a49..0000000
--- a/snippets/custom/ruby-mode/general/re
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : require '...'
-# --
-require '$1'$0
\ No newline at end of file
diff --git a/snippets/custom/ruby-mode/general/req b/snippets/custom/ruby-mode/general/req
deleted file mode 100644
index 6c01a49..0000000
--- a/snippets/custom/ruby-mode/general/req
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : require '...'
-# --
-require '$1'$0
\ No newline at end of file
diff --git a/snippets/custom/ruby-mode/.yas-make-groups b/snippets/ruby-mode/.yas-make-groups
similarity index 100%
rename from snippets/custom/ruby-mode/.yas-make-groups
rename to snippets/ruby-mode/.yas-make-groups
diff --git a/snippets/custom/ruby-mode/.yas-parents b/snippets/ruby-mode/.yas-parents
similarity index 100%
rename from snippets/custom/ruby-mode/.yas-parents
rename to snippets/ruby-mode/.yas-parents
diff --git a/snippets/ruby-mode/collections/each b/snippets/ruby-mode/collections/each
new file mode 100644
index 0000000..95e52c9
--- /dev/null
+++ b/snippets/ruby-mode/collections/each
@@ -0,0 +1,4 @@
+# name: each { |...| ... }
+# key: each
+# --
+each { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/eachwi b/snippets/ruby-mode/collections/eachwi
new file mode 100644
index 0000000..ddf867e
--- /dev/null
+++ b/snippets/ruby-mode/collections/eachwi
@@ -0,0 +1,4 @@
+# name: each_with_index { |e, i| ... }
+# key: eachwi
+# --
+each_with_index { |${e}, ${i}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/map b/snippets/ruby-mode/collections/map
new file mode 100644
index 0000000..116674b
--- /dev/null
+++ b/snippets/ruby-mode/collections/map
@@ -0,0 +1,4 @@
+# name: map { |...| ... }
+# key: map
+# --
+map { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/ruby-mode/collections/mapwi b/snippets/ruby-mode/collections/mapwi
new file mode 100644
index 0000000..609719d
--- /dev/null
+++ b/snippets/ruby-mode/collections/mapwi
@@ -0,0 +1,4 @@
+# name: map_with_index { |...| ... }
+# key: mapwi
+# --
+map_with_index { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/general/case b/snippets/ruby-mode/control structure/case
similarity index 60%
rename from snippets/stock/ruby-mode/general/case
rename to snippets/ruby-mode/control structure/case
index acc03ba..f7ecb21 100644
--- a/snippets/stock/ruby-mode/general/case
+++ b/snippets/ruby-mode/control structure/case	
@@ -1,4 +1,5 @@
-#name : case ... end
+# name: case ... end
+# key: case
 # --
 case ${1:object}
 when ${2:condition}
diff --git a/snippets/ruby-mode/control structure/else b/snippets/ruby-mode/control structure/else
new file mode 100644
index 0000000..8648ea8
--- /dev/null
+++ b/snippets/ruby-mode/control structure/else	
@@ -0,0 +1,5 @@
+# name: else
+# key: else
+# --
+else
+  $0
\ No newline at end of file
diff --git a/snippets/custom/ruby-mode/control structure/elsif b/snippets/ruby-mode/control structure/elsif
similarity index 52%
rename from snippets/custom/ruby-mode/control structure/elsif
rename to snippets/ruby-mode/control structure/elsif
index f7cf9da..bec9ce8 100644
--- a/snippets/custom/ruby-mode/control structure/elsif	
+++ b/snippets/ruby-mode/control structure/elsif	
@@ -1,4 +1,5 @@
-#name: elsif
+# name: elsif
+# key: elsif
 # --
 elsif ${1:condition}
   $0
\ No newline at end of file
diff --git a/snippets/ruby-mode/control structure/for b/snippets/ruby-mode/control structure/for
new file mode 100644
index 0000000..ef8d428
--- /dev/null
+++ b/snippets/ruby-mode/control structure/for	
@@ -0,0 +1,6 @@
+# name: for ... end
+# key: for
+# --
+for ${1:i} in ${2:length}
+	$0
+end
\ No newline at end of file
diff --git a/snippets/ruby-mode/control structure/unless b/snippets/ruby-mode/control structure/unless
new file mode 100644
index 0000000..ce4054e
--- /dev/null
+++ b/snippets/ruby-mode/control structure/unless	
@@ -0,0 +1,6 @@
+# name: unless ... end
+# key: unless
+# --
+unless ${1:condition}
+  $0
+end
\ No newline at end of file
diff --git a/snippets/ruby-mode/control structure/when b/snippets/ruby-mode/control structure/when
new file mode 100644
index 0000000..eb17a33
--- /dev/null
+++ b/snippets/ruby-mode/control structure/when	
@@ -0,0 +1,5 @@
+# name: when ... end
+# key: when
+# --
+when ${condition}
+  $0
\ No newline at end of file
diff --git a/snippets/ruby-mode/definitions/Enum b/snippets/ruby-mode/definitions/Enum
new file mode 100644
index 0000000..14344e6
--- /dev/null
+++ b/snippets/ruby-mode/definitions/Enum
@@ -0,0 +1,8 @@
+# name: include Enumerable; def each ... end
+# key: Enum
+# --
+include Enumerable
+
+def each(&block)
+	$0
+end
\ No newline at end of file
diff --git a/snippets/custom/ruby-mode/definitions/cla b/snippets/ruby-mode/definitions/cla
similarity index 79%
rename from snippets/custom/ruby-mode/definitions/cla
rename to snippets/ruby-mode/definitions/cla
index b3a4983..30186c5 100644
--- a/snippets/custom/ruby-mode/definitions/cla
+++ b/snippets/ruby-mode/definitions/cla
@@ -1,5 +1,6 @@
-#name : class ... end
-#contributor : hitesh <hitesh.jasani@gmail.com>
+# name: class ... end
+# contributor: hitesh <hitesh.jasani@gmail.com>
+# key: cla
 # --
 class ${1:`(let ((fn (capitalize (file-name-nondirectory
                                  (file-name-sans-extension
diff --git a/snippets/ruby-mode/definitions/clas b/snippets/ruby-mode/definitions/clas
new file mode 100644
index 0000000..5a8e606
--- /dev/null
+++ b/snippets/ruby-mode/definitions/clas
@@ -0,0 +1,6 @@
+# name: class << self ... end
+# key: clas
+# --
+class << ${self}
+  $0
+end
\ No newline at end of file
diff --git a/snippets/custom/ruby-mode/definitions/def b/snippets/ruby-mode/definitions/def
similarity index 52%
rename from snippets/custom/ruby-mode/definitions/def
rename to snippets/ruby-mode/definitions/def
index ffebb29..530b7fd 100644
--- a/snippets/custom/ruby-mode/definitions/def
+++ b/snippets/ruby-mode/definitions/def
@@ -1,4 +1,5 @@
-#name : def ... end
+# name: def ... end
+# key: def
 # --
 def ${1:method_name}
   $0
diff --git a/snippets/custom/ruby-mode/definitions/defs b/snippets/ruby-mode/definitions/defs
similarity index 50%
rename from snippets/custom/ruby-mode/definitions/defs
rename to snippets/ruby-mode/definitions/defs
index 65c0f0d..9b00031 100644
--- a/snippets/custom/ruby-mode/definitions/defs
+++ b/snippets/ruby-mode/definitions/defs
@@ -1,4 +1,5 @@
-#name : def self. ... end
+# name: def self. ... end
+# key: defs
 # --
 def self.${1:method_name}
   $0
diff --git a/snippets/ruby-mode/definitions/do b/snippets/ruby-mode/definitions/do
new file mode 100644
index 0000000..9a53469
--- /dev/null
+++ b/snippets/ruby-mode/definitions/do
@@ -0,0 +1,6 @@
+# name: do |variable| ... end
+# key: do
+# --
+do $1
+  $0
+end
\ No newline at end of file
diff --git a/snippets/custom/ruby-mode/definitions/mod b/snippets/ruby-mode/definitions/mod
similarity index 79%
rename from snippets/custom/ruby-mode/definitions/mod
rename to snippets/ruby-mode/definitions/mod
index ca702dc..fb3d030 100644
--- a/snippets/custom/ruby-mode/definitions/mod
+++ b/snippets/ruby-mode/definitions/mod
@@ -1,5 +1,6 @@
-#name : module ... end
-#contributor : hitesh <hitesh.jasani@gmail.com>
+# name: module ... end
+# contributor: hitesh <hitesh.jasani@gmail.com>
+# key: mod
 # --
 module ${1:`(let ((fn (capitalize (file-name-nondirectory
                                  (file-name-sans-extension
diff --git a/snippets/custom/ruby-mode/echo/bug b/snippets/ruby-mode/echo/bug
similarity index 52%
rename from snippets/custom/ruby-mode/echo/bug
rename to snippets/ruby-mode/echo/bug
index d24f5b3..1500c07 100644
--- a/snippets/custom/ruby-mode/echo/bug
+++ b/snippets/ruby-mode/echo/bug
@@ -1,4 +1,5 @@
-#name : ruby debugger
+# name: ruby debugger
+# key: bug
 # --
 require "ruby-debug"
 debugger$0
\ No newline at end of file
diff --git a/snippets/custom/ruby-mode/echo/pd b/snippets/ruby-mode/echo/pd
similarity index 72%
rename from snippets/custom/ruby-mode/echo/pd
rename to snippets/ruby-mode/echo/pd
index b5e674c..5db6e9d 100644
--- a/snippets/custom/ruby-mode/echo/pd
+++ b/snippets/ruby-mode/echo/pd
@@ -1,3 +1,4 @@
-#name : puts debug
+# name: puts debug
+# key: pd
 # --
 puts "\n>>>>>> ${1:name}: ${2:" + ${3:variable}${4:.inspect} + "}\n"$0
\ No newline at end of file
diff --git a/snippets/ruby-mode/general/Given b/snippets/ruby-mode/general/Given
new file mode 100644
index 0000000..9b640d4
--- /dev/null
+++ b/snippets/ruby-mode/general/Given
@@ -0,0 +1,4 @@
+# name: Given(...)
+# key: Given
+# --
+Given(/^${1:match}$/)$0
\ No newline at end of file
diff --git a/snippets/ruby-mode/general/Then b/snippets/ruby-mode/general/Then
new file mode 100644
index 0000000..39e3362
--- /dev/null
+++ b/snippets/ruby-mode/general/Then
@@ -0,0 +1,4 @@
+# name: Then(...)
+# key: Then
+# --
+Then(/^${1:match}$/)$0
\ No newline at end of file
diff --git a/snippets/ruby-mode/general/When b/snippets/ruby-mode/general/When
new file mode 100644
index 0000000..57fe753
--- /dev/null
+++ b/snippets/ruby-mode/general/When
@@ -0,0 +1,4 @@
+# name: When(...)
+# key: When
+# --
+When(/^${1:match}$/)$0
\ No newline at end of file
diff --git a/snippets/ruby-mode/general/re b/snippets/ruby-mode/general/re
new file mode 100644
index 0000000..babd230
--- /dev/null
+++ b/snippets/ruby-mode/general/re
@@ -0,0 +1,4 @@
+# name: require '...'
+# key: re
+# --
+require '$1'$0
\ No newline at end of file
diff --git a/snippets/ruby-mode/general/req b/snippets/ruby-mode/general/req
new file mode 100644
index 0000000..93f2f46
--- /dev/null
+++ b/snippets/ruby-mode/general/req
@@ -0,0 +1,4 @@
+# name: require '...'
+# key: req
+# --
+require '$1'$0
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/.yas-make-groups b/snippets/stock/ruby-mode/.yas-make-groups
deleted file mode 100644
index e69de29..0000000
diff --git a/snippets/stock/ruby-mode/.yas-parents b/snippets/stock/ruby-mode/.yas-parents
deleted file mode 100644
index eed5b44..0000000
--- a/snippets/stock/ruby-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-text-mode
diff --git a/snippets/stock/ruby-mode/collections/all b/snippets/stock/ruby-mode/collections/all
deleted file mode 100644
index 8bafece..0000000
--- a/snippets/stock/ruby-mode/collections/all
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : all? { |...| ... }
-# --
-all? { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/collections/any b/snippets/stock/ruby-mode/collections/any
deleted file mode 100644
index 084a2c7..0000000
--- a/snippets/stock/ruby-mode/collections/any
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : any? { |...| ... }
-# --
-any? { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/collections/classify b/snippets/stock/ruby-mode/collections/classify
deleted file mode 100644
index 0fffa2d..0000000
--- a/snippets/stock/ruby-mode/collections/classify
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : classify { |...| ... }
-# --
-classify { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/collections/collect b/snippets/stock/ruby-mode/collections/collect
deleted file mode 100644
index 32ec608..0000000
--- a/snippets/stock/ruby-mode/collections/collect
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : collect { |...| ... }
-# --
-collect { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/collections/deli b/snippets/stock/ruby-mode/collections/deli
deleted file mode 100644
index a91fc7b..0000000
--- a/snippets/stock/ruby-mode/collections/deli
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : delete_if { |...| ... }
-# --
-delete_if { |${e} $0 }
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/collections/det b/snippets/stock/ruby-mode/collections/det
deleted file mode 100644
index 734d45c..0000000
--- a/snippets/stock/ruby-mode/collections/det
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : detect { |...| ... }
-# --
-detect { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/collections/ea b/snippets/stock/ruby-mode/collections/ea
deleted file mode 100644
index c779dd6..0000000
--- a/snippets/stock/ruby-mode/collections/ea
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : each { |...| ... }
-# --
-each { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/collections/eac b/snippets/stock/ruby-mode/collections/eac
deleted file mode 100644
index 2547b2d..0000000
--- a/snippets/stock/ruby-mode/collections/eac
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : each_cons(...) { |...| ... }
-# --
-each_cons(${1:2}) { |${group}| $0 }
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/collections/eai b/snippets/stock/ruby-mode/collections/eai
deleted file mode 100644
index 4136dc0..0000000
--- a/snippets/stock/ruby-mode/collections/eai
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : each_index { |i| ... }
-# --
-each_index { |${i}| $0 }
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/collections/eav b/snippets/stock/ruby-mode/collections/eav
deleted file mode 100644
index 4ff171a..0000000
--- a/snippets/stock/ruby-mode/collections/eav
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : each_value { |val| ... }
-# --
-each_value { |${val}| $0 }
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/collections/eawi b/snippets/stock/ruby-mode/collections/eawi
deleted file mode 100644
index 3d03998..0000000
--- a/snippets/stock/ruby-mode/collections/eawi
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : each_with_index { |e, i| ... }
-# --
-each_with_index { |${e}, ${i}| $0 }
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/collections/inject b/snippets/stock/ruby-mode/collections/inject
deleted file mode 100644
index f6adb5c..0000000
--- a/snippets/stock/ruby-mode/collections/inject
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : inject(...) { |...| ... }
-# --
-inject(${1:0}) { |${2:injection}, ${3:element}| $0 }
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/collections/reject b/snippets/stock/ruby-mode/collections/reject
deleted file mode 100644
index 9625fe9..0000000
--- a/snippets/stock/ruby-mode/collections/reject
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : reject { |...| ... }
-# --
-reject { |${1:element}| $0 }
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/collections/select b/snippets/stock/ruby-mode/collections/select
deleted file mode 100644
index b18a17d..0000000
--- a/snippets/stock/ruby-mode/collections/select
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : select { |...| ... }
-# --
-select { |${1:element}| $0 }
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/collections/zip b/snippets/stock/ruby-mode/collections/zip
deleted file mode 100644
index 910de64..0000000
--- a/snippets/stock/ruby-mode/collections/zip
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : zip(...) { |...| ... }
-# --
-zip(${enums}) { |${row}| $0 }
diff --git a/snippets/stock/ruby-mode/control structure/forin b/snippets/stock/ruby-mode/control structure/forin
deleted file mode 100644
index 3d7e4d2..0000000
--- a/snippets/stock/ruby-mode/control structure/forin	
+++ /dev/null
@@ -1,5 +0,0 @@
-#name : for ... in ...; ... end
-# --
-for ${1:element} in ${2:collection}
-  $0
-end
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/control structure/if b/snippets/stock/ruby-mode/control structure/if
deleted file mode 100644
index 51bf24c..0000000
--- a/snippets/stock/ruby-mode/control structure/if	
+++ /dev/null
@@ -1,5 +0,0 @@
-#name : if ... end
-# --
-if ${1:condition}
-  $0
-end
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/control structure/ife b/snippets/stock/ruby-mode/control structure/ife
deleted file mode 100644
index 08fbb81..0000000
--- a/snippets/stock/ruby-mode/control structure/ife	
+++ /dev/null
@@ -1,7 +0,0 @@
-#name : if ... else ... end
-# --
-if ${1:condition}
-  $2
-else
-  $3
-end
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/control structure/tim b/snippets/stock/ruby-mode/control structure/tim
deleted file mode 100644
index 3a132b3..0000000
--- a/snippets/stock/ruby-mode/control structure/tim	
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : times { |n| ... }
-# --
-times { |${n}| $0 }
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/control structure/until b/snippets/stock/ruby-mode/control structure/until
deleted file mode 100644
index 95f2dcb..0000000
--- a/snippets/stock/ruby-mode/control structure/until	
+++ /dev/null
@@ -1,5 +0,0 @@
-#name : until ... end
-# --
-until ${condition}
-  $0
-end
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/control structure/upt b/snippets/stock/ruby-mode/control structure/upt
deleted file mode 100644
index b71539a..0000000
--- a/snippets/stock/ruby-mode/control structure/upt	
+++ /dev/null
@@ -1,5 +0,0 @@
-#name : upto(...) { |n| ... }
-# --
-upto(${n}) { |${i}|
-  $0
-}
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/control structure/when b/snippets/stock/ruby-mode/control structure/when
deleted file mode 100644
index 98e87b1..0000000
--- a/snippets/stock/ruby-mode/control structure/when	
+++ /dev/null
@@ -1,5 +0,0 @@
-#name : when ... end
-# --
-when ${condition}
-  $0
-end
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/control structure/while b/snippets/stock/ruby-mode/control structure/while
deleted file mode 100644
index 7e6dd55..0000000
--- a/snippets/stock/ruby-mode/control structure/while	
+++ /dev/null
@@ -1,5 +0,0 @@
-#name : while ... end
-# --
-while ${condition}
-  $0
-end
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/definitions/Comp b/snippets/stock/ruby-mode/definitions/Comp
deleted file mode 100644
index 9602d59..0000000
--- a/snippets/stock/ruby-mode/definitions/Comp
+++ /dev/null
@@ -1,7 +0,0 @@
-#name : include Comparable; def <=> ... end
-# --
-include Comparable
-
-def <=> other
-  $0
-end
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/definitions/am b/snippets/stock/ruby-mode/definitions/am
deleted file mode 100644
index 20594fd..0000000
--- a/snippets/stock/ruby-mode/definitions/am
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : alias_method new, old
-# --
-alias_method :${new_name}, :${old_name}
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/definitions/cla b/snippets/stock/ruby-mode/definitions/cla
deleted file mode 100644
index c8f3524..0000000
--- a/snippets/stock/ruby-mode/definitions/cla
+++ /dev/null
@@ -1,5 +0,0 @@
-#name : class << self ... end
-# --
-class << ${self}
-  $0
-end
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/definitions/cls b/snippets/stock/ruby-mode/definitions/cls
deleted file mode 100644
index b3a4983..0000000
--- a/snippets/stock/ruby-mode/definitions/cls
+++ /dev/null
@@ -1,12 +0,0 @@
-#name : class ... end
-#contributor : hitesh <hitesh.jasani@gmail.com>
-# --
-class ${1:`(let ((fn (capitalize (file-name-nondirectory
-                                 (file-name-sans-extension
-				 (or (buffer-file-name)
-				     (buffer-name (current-buffer))))))))
-           (cond
-             ((string-match "_" fn) (replace-match "" nil nil fn))
-              (t fn)))`}
-  $0
-end
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/definitions/mm b/snippets/stock/ruby-mode/definitions/mm
deleted file mode 100644
index 5f1ebfc..0000000
--- a/snippets/stock/ruby-mode/definitions/mm
+++ /dev/null
@@ -1,5 +0,0 @@
-#name : def method_missing ... end
-# --
-def method_missing(method, *args)
-  $0
-end
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/definitions/r b/snippets/stock/ruby-mode/definitions/r
deleted file mode 100644
index b8d68d3..0000000
--- a/snippets/stock/ruby-mode/definitions/r
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : attr_reader ...
-# --
-attr_reader :
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/definitions/rw b/snippets/stock/ruby-mode/definitions/rw
deleted file mode 100644
index aadf605..0000000
--- a/snippets/stock/ruby-mode/definitions/rw
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : attr_accessor ...
-# --
-attr_accessor :
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/definitions/w b/snippets/stock/ruby-mode/definitions/w
deleted file mode 100644
index d680f25..0000000
--- a/snippets/stock/ruby-mode/definitions/w
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : attr_writer ...
-# --
-attr_writer :
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/general/# b/snippets/stock/ruby-mode/general/#
deleted file mode 100644
index 7d21bb4..0000000
--- a/snippets/stock/ruby-mode/general/#
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : # =>
-# --
-# => 
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/general/=b b/snippets/stock/ruby-mode/general/=b
deleted file mode 100644
index 90b6e0a..0000000
--- a/snippets/stock/ruby-mode/general/=b
+++ /dev/null
@@ -1,5 +0,0 @@
-#name : =begin rdoc ... =end
-# --
-=begin rdoc
-  $0
-=end
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/general/app b/snippets/stock/ruby-mode/general/app
deleted file mode 100644
index 7bda767..0000000
--- a/snippets/stock/ruby-mode/general/app
+++ /dev/null
@@ -1,5 +0,0 @@
-#name : if __FILE__ == $PROGRAM_NAME ... end
-# --
-if __FILE__ == $PROGRAM_NAME
-  $0
-end
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/general/bm b/snippets/stock/ruby-mode/general/bm
deleted file mode 100644
index 934ff85..0000000
--- a/snippets/stock/ruby-mode/general/bm
+++ /dev/null
@@ -1,5 +0,0 @@
-#name : Benchmark.bmbm(...) do ... end
-# --
-Benchmark.bmbm(${1:10}) do |x|
-  $0
-end
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/general/dee b/snippets/stock/ruby-mode/general/dee
deleted file mode 100644
index ecec2f7..0000000
--- a/snippets/stock/ruby-mode/general/dee
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : deep_copy(...)
-# --
-Marshal.load(Marshal.dump($0))
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/general/rb b/snippets/stock/ruby-mode/general/rb
deleted file mode 100644
index f28443a..0000000
--- a/snippets/stock/ruby-mode/general/rb
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : /usr/bin/ruby -wKU
-# --
-#!/usr/bin/env ruby -wKU
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/general/req b/snippets/stock/ruby-mode/general/req
deleted file mode 100644
index 2fbc3d4..0000000
--- a/snippets/stock/ruby-mode/general/req
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : require "..."
-# --
-require "$0"
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/general/rreq b/snippets/stock/ruby-mode/general/rreq
deleted file mode 100644
index 84ac9df..0000000
--- a/snippets/stock/ruby-mode/general/rreq
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : require File.join(File.dirname(__FILE__), ...)
-# --
-require File.join(File.dirname(__FILE__), $0)
\ No newline at end of file
diff --git a/snippets/stock/ruby-mode/general/y b/snippets/stock/ruby-mode/general/y
deleted file mode 100644
index cdec730..0000000
--- a/snippets/stock/ruby-mode/general/y
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : :yields: arguments (rdoc)
-# --
-:yields: $0
\ No newline at end of file