diff --git a/bash/mdcat/mdcat.sh b/bash/cat.sh
similarity index 100%
rename from bash/mdcat/mdcat.sh
rename to bash/cat.sh
diff --git a/bash/last/last.sh b/bash/last.sh
similarity index 100%
rename from bash/last/last.sh
rename to bash/last.sh
diff --git a/bash/next/next.sh b/bash/next.sh
similarity index 98%
rename from bash/next/next.sh
rename to bash/next.sh
index dd69135..6dbbd10 100755
--- a/bash/next/next.sh
+++ b/bash/next.sh
@@ -65,7 +65,7 @@
 # 4. NOTE: I use 'e' rather than 'emacs', to use my clever emacs/emacsclient function.
 
 
-NEXTFILE=`$UMBASEPATH/bash/last/last.sh | awk '
+NEXTFILE=`$UMBASEPATH/last.sh | awk '
 
 BEGIN {
 # set field separator, blank by default
diff --git a/bash/next/args.sh b/bash/next/args.sh
deleted file mode 100755
index 2278e57..0000000
--- a/bash/next/args.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-# why can't i use bash if statement, before appending an empty arg string?
-
-last=`ls | egrep '^\d.*\.md|txt' | tail -n 1`
-
-if ($* != "")
-    last=last + $*;
-
-awk '
-{
-print $0
-}
-END {print NR}' last
diff --git a/bash/next/emacs_script.sh b/bash/next/emacs_script.sh
deleted file mode 100755
index b5b2f31..0000000
--- a/bash/next/emacs_script.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# emacs --debug-init blah
-emacs `ls | grep '^\d' | tail -n 1`
diff --git a/bash/next/test/001.md b/bash/next/test/001.md
deleted file mode 100755
index e69de29..0000000
diff --git a/bash/next/test/002.blah.md b/bash/next/test/002.blah.md
deleted file mode 100755
index e69de29..0000000
diff --git a/bash/next/test/004.foo.md b/bash/next/test/004.foo.md
deleted file mode 100755
index e69de29..0000000
diff --git a/bash/next/test/005.md b/bash/next/test/005.md
deleted file mode 100755
index e69de29..0000000
diff --git a/bash/next/test/009.boo.md b/bash/next/test/009.boo.md
deleted file mode 100755
index e69de29..0000000
diff --git a/bash/next/test/098.baa.md b/bash/next/test/098.baa.md
deleted file mode 100755
index e69de29..0000000
diff --git a/bash/next/test/099.poo.md b/bash/next/test/099.poo.md
deleted file mode 100755
index e69de29..0000000
diff --git a/bash/rename/rename.sh b/bash/rename.sh
similarity index 100%
rename from bash/rename/rename.sh
rename to bash/rename.sh
diff --git a/bash/rename/test/001.bar.txt b/bash/rename/test/001.bar.txt
deleted file mode 100755
index e69de29..0000000
diff --git a/bash/rename/test/06.foo.md b/bash/rename/test/06.foo.md
deleted file mode 100755
index e69de29..0000000
diff --git a/bash/rename/test/07.blah.txt b/bash/rename/test/07.blah.txt
deleted file mode 100755
index e69de29..0000000
diff --git a/bash/rename/test/100.foo.md b/bash/rename/test/100.foo.md
deleted file mode 100755
index e69de29..0000000
diff --git a/bash/rename/test/245.blah_foo.md b/bash/rename/test/245.blah_foo.md
deleted file mode 100755
index e69de29..0000000
diff --git a/bash/last/test/001.md b/bash/test/001.md
similarity index 100%
rename from bash/last/test/001.md
rename to bash/test/001.md
diff --git a/bash/last/test/002.blah.md b/bash/test/002.blah.md
similarity index 100%
rename from bash/last/test/002.blah.md
rename to bash/test/002.blah.md
diff --git a/bash/last/test/004.foo.md b/bash/test/004.foo.md
similarity index 100%
rename from bash/last/test/004.foo.md
rename to bash/test/004.foo.md
diff --git a/bash/last/test/005.md b/bash/test/005.md
similarity index 100%
rename from bash/last/test/005.md
rename to bash/test/005.md
diff --git a/bash/last/test/009.boo.md b/bash/test/009.boo.md
similarity index 100%
rename from bash/last/test/009.boo.md
rename to bash/test/009.boo.md
diff --git a/bash/last/test/098.baa.md b/bash/test/098.baa.md
similarity index 100%
rename from bash/last/test/098.baa.md
rename to bash/test/098.baa.md
diff --git a/bash/last/test/099.poo.md b/bash/test/099.poo.md
similarity index 100%
rename from bash/last/test/099.poo.md
rename to bash/test/099.poo.md
diff --git a/um b/bash/um
similarity index 66%
rename from um
rename to bash/um
index 47edd11..d0616c1 100755
--- a/um
+++ b/bash/um
@@ -6,17 +6,17 @@ export UMBASEPATH=`realpath $0 | xargs dirname`
 # catch first arguments with $1
 case "$1" in
     next)
-        $UMBASEPATH/bash/next/next.sh $2
+        $UMBASEPATH/next.sh $2
         ;;
     last)
-        $UMBASEPATH/bash/last/last.sh
+        $UMBASEPATH/last.sh
         ;;
     cat)
         # all args but first
-        $UMBASEPATH/bash/mdcat/mdcat.sh "${@:2}"
+        $UMBASEPATH/cat.sh "${@:2}"
         ;;
     rename)
-        $UMBASEPATH/bash/rename/rename.sh "${@:2}"
+        $UMBASEPATH/rename.sh "${@:2}"
         ;;
     *)
         # else