diff --git a/snippets/enh-ruby-mode/.yas-make-groups b/snippets/enh-ruby-mode/.yas-make-groups
deleted file mode 100644
index e69de29..0000000
diff --git a/snippets/enh-ruby-mode/.yas-parents b/snippets/enh-ruby-mode/.yas-parents
index eed5b44..1bd2276 100644
--- a/snippets/enh-ruby-mode/.yas-parents
+++ b/snippets/enh-ruby-mode/.yas-parents
@@ -1 +1 @@
-text-mode
+ruby-mode
diff --git a/snippets/enh-ruby-mode/collections/each b/snippets/enh-ruby-mode/collections/each
deleted file mode 100644
index 95e52c9..0000000
--- a/snippets/enh-ruby-mode/collections/each
+++ /dev/null
@@ -1,4 +0,0 @@
-# name: each { |...| ... }
-# key: each
-# --
-each { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/collections/eachwi b/snippets/enh-ruby-mode/collections/eachwi
deleted file mode 100644
index ddf867e..0000000
--- a/snippets/enh-ruby-mode/collections/eachwi
+++ /dev/null
@@ -1,4 +0,0 @@
-# name: each_with_index { |e, i| ... }
-# key: eachwi
-# --
-each_with_index { |${e}, ${i}| $0 }
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/collections/map b/snippets/enh-ruby-mode/collections/map
deleted file mode 100644
index 116674b..0000000
--- a/snippets/enh-ruby-mode/collections/map
+++ /dev/null
@@ -1,4 +0,0 @@
-# name: map { |...| ... }
-# key: map
-# --
-map { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/collections/mapwi b/snippets/enh-ruby-mode/collections/mapwi
deleted file mode 100644
index 609719d..0000000
--- a/snippets/enh-ruby-mode/collections/mapwi
+++ /dev/null
@@ -1,4 +0,0 @@
-# name: map_with_index { |...| ... }
-# key: mapwi
-# --
-map_with_index { |${e}| $0 }
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/control structure/case b/snippets/enh-ruby-mode/control structure/case
deleted file mode 100644
index f7ecb21..0000000
--- a/snippets/enh-ruby-mode/control structure/case	
+++ /dev/null
@@ -1,7 +0,0 @@
-# name: case ... end
-# key: case
-# --
-case ${1:object}
-when ${2:condition}
-  $0
-end
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/control structure/else b/snippets/enh-ruby-mode/control structure/else
deleted file mode 100644
index 8648ea8..0000000
--- a/snippets/enh-ruby-mode/control structure/else	
+++ /dev/null
@@ -1,5 +0,0 @@
-# name: else
-# key: else
-# --
-else
-  $0
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/control structure/elsif b/snippets/enh-ruby-mode/control structure/elsif
deleted file mode 100644
index bec9ce8..0000000
--- a/snippets/enh-ruby-mode/control structure/elsif	
+++ /dev/null
@@ -1,5 +0,0 @@
-# name: elsif
-# key: elsif
-# --
-elsif ${1:condition}
-  $0
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/control structure/for b/snippets/enh-ruby-mode/control structure/for
deleted file mode 100644
index ef8d428..0000000
--- a/snippets/enh-ruby-mode/control structure/for	
+++ /dev/null
@@ -1,6 +0,0 @@
-# name: for ... end
-# key: for
-# --
-for ${1:i} in ${2:length}
-	$0
-end
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/control structure/unless b/snippets/enh-ruby-mode/control structure/unless
deleted file mode 100644
index ce4054e..0000000
--- a/snippets/enh-ruby-mode/control structure/unless	
+++ /dev/null
@@ -1,6 +0,0 @@
-# name: unless ... end
-# key: unless
-# --
-unless ${1:condition}
-  $0
-end
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/control structure/when b/snippets/enh-ruby-mode/control structure/when
deleted file mode 100644
index eb17a33..0000000
--- a/snippets/enh-ruby-mode/control structure/when	
+++ /dev/null
@@ -1,5 +0,0 @@
-# name: when ... end
-# key: when
-# --
-when ${condition}
-  $0
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/definitions/Enum b/snippets/enh-ruby-mode/definitions/Enum
deleted file mode 100644
index b9ccdcc..0000000
--- a/snippets/enh-ruby-mode/definitions/Enum
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/enh-ruby-mode/definitions/cla b/snippets/enh-ruby-mode/definitions/cla
deleted file mode 100644
index 30186c5..0000000
--- a/snippets/enh-ruby-mode/definitions/cla
+++ /dev/null
@@ -1,13 +0,0 @@
-# name: class ... end
-# contributor: hitesh <hitesh.jasani@gmail.com>
-# key: cla
-# --
-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/enh-ruby-mode/definitions/clas b/snippets/enh-ruby-mode/definitions/clas
deleted file mode 100644
index 5a8e606..0000000
--- a/snippets/enh-ruby-mode/definitions/clas
+++ /dev/null
@@ -1,6 +0,0 @@
-# name: class << self ... end
-# key: clas
-# --
-class << ${self}
-  $0
-end
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/definitions/def b/snippets/enh-ruby-mode/definitions/def
deleted file mode 100644
index 530b7fd..0000000
--- a/snippets/enh-ruby-mode/definitions/def
+++ /dev/null
@@ -1,6 +0,0 @@
-# name: def ... end
-# key: def
-# --
-def ${1:method_name}
-  $0
-end
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/definitions/defs b/snippets/enh-ruby-mode/definitions/defs
deleted file mode 100644
index 9b00031..0000000
--- a/snippets/enh-ruby-mode/definitions/defs
+++ /dev/null
@@ -1,6 +0,0 @@
-# name: def self. ... end
-# key: defs
-# --
-def self.${1:method_name}
-  $0
-end
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/definitions/do b/snippets/enh-ruby-mode/definitions/do
deleted file mode 100644
index 9a53469..0000000
--- a/snippets/enh-ruby-mode/definitions/do
+++ /dev/null
@@ -1,6 +0,0 @@
-# name: do |variable| ... end
-# key: do
-# --
-do $1
-  $0
-end
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/definitions/mod b/snippets/enh-ruby-mode/definitions/mod
deleted file mode 100644
index 118400c..0000000
--- a/snippets/enh-ruby-mode/definitions/mod
+++ /dev/null
@@ -1,13 +0,0 @@
-# name: module ... end
-# contributor: hitesh <hitesh.jasani@gmail.com>, jimeh <contact@jimeh.me>
-# key: mod
-# --
-module ${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/enh-ruby-mode/echo/bug b/snippets/enh-ruby-mode/echo/bug
deleted file mode 100644
index 30c5acd..0000000
--- a/snippets/enh-ruby-mode/echo/bug
+++ /dev/null
@@ -1,5 +0,0 @@
-# name: ruby debugger
-# key: bug
-# --
-require 'ruby-debug'
-debugger$0
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/echo/pd b/snippets/enh-ruby-mode/echo/pd
deleted file mode 100644
index f8e4c5f..0000000
--- a/snippets/enh-ruby-mode/echo/pd
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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/enh-ruby-mode/echo/pp b/snippets/enh-ruby-mode/echo/pp
deleted file mode 100644
index ec1ffcd..0000000
--- a/snippets/enh-ruby-mode/echo/pp
+++ /dev/null
@@ -1,5 +0,0 @@
-# name: pp ...
-# key: pp
-# --
-require 'pp'
-pp $0
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/echo/ppd b/snippets/enh-ruby-mode/echo/ppd
deleted file mode 100644
index c1f129d..0000000
--- a/snippets/enh-ruby-mode/echo/ppd
+++ /dev/null
@@ -1,4 +0,0 @@
-# name: puts ...; pp ...
-# key: ppd
-# --
-puts "\n>>>>>> ${1:name}:"; pp $0
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/echo/spd b/snippets/enh-ruby-mode/echo/spd
deleted file mode 100644
index 1bea90f..0000000
--- a/snippets/enh-ruby-mode/echo/spd
+++ /dev/null
@@ -1,4 +0,0 @@
-# name: STDOUT.puts debug
-# key: spd
-# --
-STDOUT.puts "\n>>>>>> ${1:name}: ${2:#{${3:variable}${4:.inspect}}}\n"$0
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/general/Given b/snippets/enh-ruby-mode/general/Given
deleted file mode 100644
index 9b640d4..0000000
--- a/snippets/enh-ruby-mode/general/Given
+++ /dev/null
@@ -1,4 +0,0 @@
-# name: Given(...)
-# key: Given
-# --
-Given(/^${1:match}$/)$0
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/general/Then b/snippets/enh-ruby-mode/general/Then
deleted file mode 100644
index 39e3362..0000000
--- a/snippets/enh-ruby-mode/general/Then
+++ /dev/null
@@ -1,4 +0,0 @@
-# name: Then(...)
-# key: Then
-# --
-Then(/^${1:match}$/)$0
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/general/When b/snippets/enh-ruby-mode/general/When
deleted file mode 100644
index 57fe753..0000000
--- a/snippets/enh-ruby-mode/general/When
+++ /dev/null
@@ -1,4 +0,0 @@
-# name: When(...)
-# key: When
-# --
-When(/^${1:match}$/)$0
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/general/con b/snippets/enh-ruby-mode/general/con
deleted file mode 100644
index 1c7283c..0000000
--- a/snippets/enh-ruby-mode/general/con
+++ /dev/null
@@ -1,4 +0,0 @@
-# name: context '...'
-# key: con
-# --
-context "$1"$0
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/general/des b/snippets/enh-ruby-mode/general/des
deleted file mode 100644
index 328a6c7..0000000
--- a/snippets/enh-ruby-mode/general/des
+++ /dev/null
@@ -1,4 +0,0 @@
-# name: describe '...'
-# key: des
-# --
-describe "$1"$0
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/general/eb b/snippets/enh-ruby-mode/general/eb
deleted file mode 100644
index e24412a..0000000
--- a/snippets/enh-ruby-mode/general/eb
+++ /dev/null
@@ -1,4 +0,0 @@
-# name: expect(...).to be ...
-# key: eb
-# --
-expect($1).to be $0
diff --git a/snippets/enh-ruby-mode/general/ee b/snippets/enh-ruby-mode/general/ee
deleted file mode 100644
index b5d8e7b..0000000
--- a/snippets/enh-ruby-mode/general/ee
+++ /dev/null
@@ -1,4 +0,0 @@
-# name: expect(...).to eq(...)
-# key: ee
-# --
-expect($1).to eq($0)
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/general/ex b/snippets/enh-ruby-mode/general/ex
deleted file mode 100644
index 3fae6bf..0000000
--- a/snippets/enh-ruby-mode/general/ex
+++ /dev/null
@@ -1,4 +0,0 @@
-# name: expect(...).to ...
-# key: ex
-# --
-expect($1).to $0
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/general/re b/snippets/enh-ruby-mode/general/re
deleted file mode 100644
index babd230..0000000
--- a/snippets/enh-ruby-mode/general/re
+++ /dev/null
@@ -1,4 +0,0 @@
-# name: require '...'
-# key: re
-# --
-require '$1'$0
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/general/req b/snippets/enh-ruby-mode/general/req
deleted file mode 100644
index 93f2f46..0000000
--- a/snippets/enh-ruby-mode/general/req
+++ /dev/null
@@ -1,4 +0,0 @@
-# name: require '...'
-# key: req
-# --
-require '$1'$0
\ No newline at end of file
diff --git a/snippets/enh-ruby-mode/misc/atr b/snippets/enh-ruby-mode/misc/atr
deleted file mode 100644
index 9384079..0000000
--- a/snippets/enh-ruby-mode/misc/atr
+++ /dev/null
@@ -1,7 +0,0 @@
-# name: attributes(:name => :name, :market_name => "")
-# key: atr
-# --
-attributes(
-  :name        => :${1:name},
-  :market_name => "$0"
-)
\ No newline at end of file
diff --git a/snippets/go-mode/pd b/snippets/go-mode/pd
index 8da0958..94f6bab 100644
--- a/snippets/go-mode/pd
+++ b/snippets/go-mode/pd
@@ -1,3 +1,4 @@
+# name: fmt.Println(...)
 # key: pd
 # --
 fmt.Println($0)
\ No newline at end of file