diff --git a/applescript-mode/.yas-parents b/applescript-mode/.yas-parents
index d58dacb..0539988 100644
--- a/applescript-mode/.yas-parents
+++ b/applescript-mode/.yas-parents
@@ -1 +1 @@
-text-mode
\ No newline at end of file
+prog-mode
\ No newline at end of file
diff --git a/autoconf-mode/.yas-parents b/autoconf-mode/.yas-parents
deleted file mode 100644
index d58dacb..0000000
--- a/autoconf-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-text-mode
\ No newline at end of file
diff --git a/c-mode/.yas-parents b/c-mode/.yas-parents
index 4ad42bb..ce9828b 100644
--- a/c-mode/.yas-parents
+++ b/c-mode/.yas-parents
@@ -1,2 +1 @@
 cc-mode
-text-mode
\ No newline at end of file
diff --git a/cmake-mode/.yas-parents b/cmake-mode/.yas-parents
deleted file mode 100644
index d58dacb..0000000
--- a/cmake-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-text-mode
\ No newline at end of file
diff --git a/css-mode/.yas-parents b/css-mode/.yas-parents
deleted file mode 100644
index d58dacb..0000000
--- a/css-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-text-mode
\ No newline at end of file
diff --git a/emacs-lisp-mode/.yas-parents b/emacs-lisp-mode/.yas-parents
deleted file mode 100644
index eed5b44..0000000
--- a/emacs-lisp-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-text-mode
diff --git a/text-mode/.yas-setup.el b/fundamental-mode/.yas-setup.el
similarity index 78%
rename from text-mode/.yas-setup.el
rename to fundamental-mode/.yas-setup.el
index 6f81cf5..cc4a171 100644
--- a/text-mode/.yas-setup.el
+++ b/fundamental-mode/.yas-setup.el
@@ -1,6 +1,3 @@
-(defun yas-with-comment (str)
-  (format "%s%s%s" comment-start str comment-end))
-
 (defun ca-all-asscs (asslist query)
   "returns a list of all corresponding values (like rassoc)"
   (cond
diff --git a/text-mode/bang b/fundamental-mode/bang
similarity index 100%
rename from text-mode/bang
rename to fundamental-mode/bang
diff --git a/text-mode/bash b/fundamental-mode/bash
similarity index 100%
rename from text-mode/bash
rename to fundamental-mode/bash
diff --git a/text-mode/email b/fundamental-mode/email
similarity index 100%
rename from text-mode/email
rename to fundamental-mode/email
diff --git a/text-mode/localvar b/fundamental-mode/localvar
similarity index 100%
rename from text-mode/localvar
rename to fundamental-mode/localvar
diff --git a/text-mode/mode b/fundamental-mode/mode
similarity index 100%
rename from text-mode/mode
rename to fundamental-mode/mode
diff --git a/text-mode/time b/fundamental-mode/time
similarity index 100%
rename from text-mode/time
rename to fundamental-mode/time
diff --git a/go-mode/.yas-parents b/go-mode/.yas-parents
deleted file mode 100644
index d58dacb..0000000
--- a/go-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-text-mode
\ No newline at end of file
diff --git a/groovy-mode/.yas-parents b/groovy-mode/.yas-parents
index 4dea76a..c23a148 100644
--- a/groovy-mode/.yas-parents
+++ b/groovy-mode/.yas-parents
@@ -1 +1 @@
-text-mode java-mode
\ No newline at end of file
+java-mode
\ No newline at end of file
diff --git a/haskell-mode/.yas-parents b/haskell-mode/.yas-parents
deleted file mode 100644
index d58dacb..0000000
--- a/haskell-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-text-mode
\ No newline at end of file
diff --git a/java-mode/.yas-parents b/java-mode/.yas-parents
deleted file mode 100644
index eed5b44..0000000
--- a/java-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-text-mode
diff --git a/js-mode/.yas-parents b/js-mode/.yas-parents
deleted file mode 100644
index d58dacb..0000000
--- a/js-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-text-mode
\ No newline at end of file
diff --git a/latex-mode/.yas-parents b/latex-mode/.yas-parents
deleted file mode 100644
index d58dacb..0000000
--- a/latex-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-text-mode
\ No newline at end of file
diff --git a/ledger-mode/.yas-parents b/ledger-mode/.yas-parents
deleted file mode 100644
index d58dacb..0000000
--- a/ledger-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-text-mode
\ No newline at end of file
diff --git a/makefile-mode/.yas-parents b/makefile-mode/.yas-parents
deleted file mode 100644
index d58dacb..0000000
--- a/makefile-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-text-mode
\ No newline at end of file
diff --git a/ned-mode/.yas-parents b/ned-mode/.yas-parents
index d58dacb..0539988 100644
--- a/ned-mode/.yas-parents
+++ b/ned-mode/.yas-parents
@@ -1 +1 @@
-text-mode
\ No newline at end of file
+prog-mode
\ No newline at end of file
diff --git a/nsis-mode/.yas-parents b/nsis-mode/.yas-parents
index d58dacb..0539988 100644
--- a/nsis-mode/.yas-parents
+++ b/nsis-mode/.yas-parents
@@ -1 +1 @@
-text-mode
\ No newline at end of file
+prog-mode
\ No newline at end of file
diff --git a/org-mode/.yas-parents b/org-mode/.yas-parents
deleted file mode 100644
index d58dacb..0000000
--- a/org-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-text-mode
\ No newline at end of file
diff --git a/prog-mode/.yas-setup.el b/prog-mode/.yas-setup.el
new file mode 100644
index 0000000..03d07cf
--- /dev/null
+++ b/prog-mode/.yas-setup.el
@@ -0,0 +1,2 @@
+(defun yas-with-comment (str)
+  (format "%s%s%s" comment-start str comment-end))
diff --git a/text-mode/fixme b/prog-mode/fixme
similarity index 100%
rename from text-mode/fixme
rename to prog-mode/fixme
diff --git a/text-mode/todo b/prog-mode/todo
similarity index 100%
rename from text-mode/todo
rename to prog-mode/todo
diff --git a/text-mode/xxx b/prog-mode/xxx
similarity index 100%
rename from text-mode/xxx
rename to prog-mode/xxx
diff --git a/puppet-mode/.yas-parents b/puppet-mode/.yas-parents
deleted file mode 100644
index d58dacb..0000000
--- a/puppet-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-text-mode
\ No newline at end of file
diff --git a/python-mode/.yas-parents b/python-mode/.yas-parents
deleted file mode 100644
index d58dacb..0000000
--- a/python-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-text-mode
\ No newline at end of file
diff --git a/text-mode/code b/rst-mode/code
similarity index 100%
rename from text-mode/code
rename to rst-mode/code
diff --git a/ruby-mode/.yas-parents b/ruby-mode/.yas-parents
deleted file mode 100644
index d58dacb..0000000
--- a/ruby-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-text-mode
\ No newline at end of file
diff --git a/scala-mode/.yas-parents b/scala-mode/.yas-parents
deleted file mode 100644
index d58dacb..0000000
--- a/scala-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-text-mode
\ No newline at end of file
diff --git a/sh-mode/.yas-parents b/sh-mode/.yas-parents
deleted file mode 100644
index d58dacb..0000000
--- a/sh-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-text-mode
\ No newline at end of file
diff --git a/sql-mode/.yas-parents b/sql-mode/.yas-parents
deleted file mode 100644
index d58dacb..0000000
--- a/sql-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-text-mode
\ No newline at end of file
diff --git a/text-mode/.yas-parents b/text-mode/.yas-parents
new file mode 100644
index 0000000..c3ca481
--- /dev/null
+++ b/text-mode/.yas-parents
@@ -0,0 +1 @@
+fundamental-mode
diff --git a/tuareg-mode/.yas-parents b/tuareg-mode/.yas-parents
deleted file mode 100644
index d58dacb..0000000
--- a/tuareg-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-text-mode
\ No newline at end of file
diff --git a/yaml-mode/.yas-parents b/yaml-mode/.yas-parents
deleted file mode 100644
index d58dacb..0000000
--- a/yaml-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-text-mode
\ No newline at end of file