diff --git a/applications/fish b/applications/fish
index 4df1b27..9b0b1b8 100644
--- a/applications/fish
+++ b/applications/fish
@@ -9,8 +9,9 @@ function rebuild
    $HOME/src/scripts/rebuild.rkt $argv
 end
 
-source ~/src/scripts/prompt.fish
-source ~/src/scripts/cheat.fish
-source ~/src/scripts/ql.fish
+source ~/src/scripts/fish/megadl.fish
+source ~/src/scripts/fish/prompt.fish
+source ~/src/scripts/fish/cheat.fish
+source ~/src/scripts/fish/ql.fish
 
 ## EOF
diff --git a/scripts/crtolf.fish b/scripts/cmds/crtolf.fish
similarity index 100%
rename from scripts/crtolf.fish
rename to scripts/cmds/crtolf.fish
diff --git a/scripts/find-stereo.fish b/scripts/cmds/find-stereo.fish
similarity index 100%
rename from scripts/find-stereo.fish
rename to scripts/cmds/find-stereo.fish
diff --git a/scripts/flac2mp3.fish b/scripts/cmds/flac2mp3.fish
similarity index 100%
rename from scripts/flac2mp3.fish
rename to scripts/cmds/flac2mp3.fish
diff --git a/scripts/generate-grub.sh b/scripts/cmds/generate-grub.sh
similarity index 100%
rename from scripts/generate-grub.sh
rename to scripts/cmds/generate-grub.sh
diff --git a/scripts/update-vim-plugins.fish b/scripts/cmds/update-vim-plugins.fish
similarity index 100%
rename from scripts/update-vim-plugins.fish
rename to scripts/cmds/update-vim-plugins.fish
diff --git a/scripts/vnc.fish b/scripts/cmds/vnc.fish
similarity index 100%
rename from scripts/vnc.fish
rename to scripts/cmds/vnc.fish
diff --git a/scripts/cheat.fish b/scripts/fish/cheat.fish
similarity index 100%
rename from scripts/cheat.fish
rename to scripts/fish/cheat.fish
diff --git a/scripts/fish/megadl.fish b/scripts/fish/megadl.fish
new file mode 100755
index 0000000..9ac2159
--- /dev/null
+++ b/scripts/fish/megadl.fish
@@ -0,0 +1,5 @@
+function megadl-all
+   megadl (cat ~/dl)
+end
+
+## EOF
diff --git a/scripts/prompt.fish b/scripts/fish/prompt.fish
similarity index 81%
rename from scripts/prompt.fish
rename to scripts/fish/prompt.fish
index a2867d5..fec3d2b 100644
--- a/scripts/prompt.fish
+++ b/scripts/fish/prompt.fish
@@ -8,7 +8,7 @@ end
 
 function fish_greeting
    echo "Word of the moment: "(shuf -n1 /usr/share/dict/words) |
-      awk -f ~/src/scripts/mid.awk col=$COLUMNS
+      awk -f ~/src/scripts/text/mid.awk col=$COLUMNS
 end
 
 ## EOF
diff --git a/scripts/ql.fish b/scripts/fish/ql.fish
similarity index 100%
rename from scripts/ql.fish
rename to scripts/fish/ql.fish
diff --git a/scripts/megadl.fish b/scripts/megadl.fish
deleted file mode 100755
index 27e54ea..0000000
--- a/scripts/megadl.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env fish
-
-megadl (cat ~/dl)
diff --git a/scripts/mid.awk b/scripts/text/mid.awk
similarity index 100%
rename from scripts/mid.awk
rename to scripts/text/mid.awk
diff --git a/scripts/text/newcomments.sed b/scripts/text/newcomments.sed
new file mode 100755
index 0000000..fdb77a0
--- /dev/null
+++ b/scripts/text/newcomments.sed
@@ -0,0 +1,25 @@
+1{
+   i\
+/* ---------------------------------------------------------------------------|\
+ *
+}
+1,3{
+   s/\/\// */
+}
+4{
+   c\
+ *\
+ * ---------------------------------------------------------------------------|\
+ *
+}
+5{
+   s/\/\/ \w\+\..: \(.\+\)/ * \1/
+}
+6{
+   i\
+ *\
+ * ---------------------------------------------------------------------------|\
+ */
+}
+s/--|$//
+s/\/\/\(.\+\)/\/*\1 *\//
diff --git a/scripts/text/newcomments2.sed b/scripts/text/newcomments2.sed
new file mode 100755
index 0000000..6e3103c
--- /dev/null
+++ b/scripts/text/newcomments2.sed
@@ -0,0 +1,17 @@
+1{
+   i\
+/* ---------------------------------------------------------------------------|\
+ *
+}
+1,3{
+   s/\/\// */
+}
+4{
+   c\
+ *\
+ * ---------------------------------------------------------------------------|\
+ */\
+
+}
+s/--|$//
+s/\/\/\(.\+\)/\/*\1 *\//
diff --git a/scripts/text/oldcomments.sed b/scripts/text/oldcomments.sed
new file mode 100755
index 0000000..998301a
--- /dev/null
+++ b/scripts/text/oldcomments.sed
@@ -0,0 +1,21 @@
+$! {  N
+      N
+      s/\/\/-+\|\n//
+      t m1
+      b mE
+:m1;  s/  / MARKER/
+      h
+      s/.+MARKER//
+      s/ /-/g
+      x
+      s/MARKER.+//
+      x
+      H
+      x
+      s/ \n-/ --/
+      t m2
+      b mE
+:m2;  N
+      N
+      s/\/\/\n//g
+:mE;  }