diff --git a/regression/Makefile b/regression/Makefile
index e9984116745..e8a0f506983 100644
--- a/regression/Makefile
+++ b/regression/Makefile
@@ -1,5 +1,5 @@
 
-DIRS = ansi-c cbmc cpp goto-instrument goto-instrument-unwind goto-analyzer inlining
+DIRS = ansi-c cbmc cpp goto-instrument goto-analyzer
 
 test:
 	$(foreach var,$(DIRS), $(MAKE) -C $(var) test || exit 1;)
diff --git a/regression/goto-instrument-unwind/Makefile b/regression/goto-instrument-unwind/Makefile
deleted file mode 100644
index 5af34f6d089..00000000000
--- a/regression/goto-instrument-unwind/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-default: tests.log
-
-testalpha:
-	@../test.pl -c ../unwind-chain.sh -C
-
-testbeta:
-	@../test.pl -c ../unwind-chain.sh -T
-
-testimpr:
-	@../test.pl -c ../unwind-chain.sh -K
-
-testnew:
-	@../test.pl -c ../unwind-chain.sh -F
-
-test:
-	@../test.pl -c ../unwind-chain.sh
-
-tests.log: ../test.pl
-	@../test.pl -c ../unwind-chain.sh
-
-clean:
-	@for dir in *; do \
-                if [ -d "$$dir" ]; then \
-                        rm -f $$dir/*.txt $$dir/*.dot $$dir/*.gb $$dir/*.out; \
-                fi; \
-  done;
-	rm -f tests.log
-
-show:
-	@for dir in *; do \
-		if [ -d "$$dir" ]; then \
-			vim -o "$$dir/*.c" "$$dir/*.out"; \
-		fi; \
-	done;
diff --git a/regression/goto-instrument-unwind/unwind-chain.sh b/regression/goto-instrument-unwind/unwind-chain.sh
deleted file mode 100755
index e15cf5cb497..00000000000
--- a/regression/goto-instrument-unwind/unwind-chain.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-src=../../../src
-goto_cc=$src/goto-cc/goto-cc
-goto_instrument=$src/goto-instrument/goto-instrument
-cbmc=$src/cbmc/cbmc
-
-name=${@:$#}
-name=${name%.c}
-
-args=${@:1:$#-1}
-
-$goto_cc -o $name.gb $name.c
-$goto_instrument --show-goto-functions $name.gb
-$goto_instrument $args $name.gb ${name}-unwound.gb
-$goto_instrument --show-goto-functions ${name}-unwound.gb
-$cbmc ${name}-unwound.gb
-
diff --git a/regression/goto-instrument/chain.sh b/regression/goto-instrument/chain.sh
index ce2db004a7c..68f50b095bc 100755
--- a/regression/goto-instrument/chain.sh
+++ b/regression/goto-instrument/chain.sh
@@ -1,8 +1,11 @@
 #!/bin/bash
 
+set -e
+
 src=../../../src
 goto_cc=$src/goto-cc/goto-cc
 goto_instrument=$src/goto-instrument/goto-instrument
+cbmc=$src/cbmc/cbmc
 
 name=${@:$#}
 name=${name%.c}
@@ -10,5 +13,15 @@ name=${name%.c}
 args=${@:1:$#-1}
 
 $goto_cc -o $name.gb $name.c
-$goto_instrument $args $name.gb
+# $goto_instrument --show-goto-functions $name.gb
+$goto_instrument $args $name.gb ${name}-mod.gb
+if [ ! -e ${name}-mod.gb ] ; then
+  cp $name.gb ${name}-mod.gb
+elif echo "$args" | grep -q -- "--dump-c" ; then
+  mv ${name}-mod.gb ${name}-mod.c
+  $goto_cc ${name}-mod.c -o ${name}-mod.gb
+  rm ${name}-mod.c
+fi
+$goto_instrument --show-goto-functions ${name}-mod.gb
+$cbmc ${name}-mod.gb
 
diff --git a/regression/goto-instrument/const-struct1/test.desc b/regression/goto-instrument/const-struct1/test.desc
index ae74032217a..40306e23153 100644
--- a/regression/goto-instrument/const-struct1/test.desc
+++ b/regression/goto-instrument/const-struct1/test.desc
@@ -1,6 +1,6 @@
 KNOWNBUG
 main.c
-"--show-symbol-table"
+--show-symbol-table
 ^Type\.*: struct struct_tag_name$
 ^Type\.*: const double$
 ^EXIT=0$
diff --git a/regression/goto-instrument/data-flow1/test.desc b/regression/goto-instrument/data-flow1/test.desc
index 4626f53f2e1..a11f4754f21 100644
--- a/regression/goto-instrument/data-flow1/test.desc
+++ b/regression/goto-instrument/data-flow1/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
-"--show-dependence-graph"
+--show-dependence-graph
 ^EXIT=0$
 ^SIGNAL=0$
 Data dependencies: *[0-9]\+,[0-9]\+,[0-9]\+
diff --git a/regression/inlining/inline_01/main.c b/regression/goto-instrument/inline_01/main.c
similarity index 100%
rename from regression/inlining/inline_01/main.c
rename to regression/goto-instrument/inline_01/main.c
diff --git a/regression/inlining/inline_01/test.desc b/regression/goto-instrument/inline_01/test.desc
similarity index 100%
rename from regression/inlining/inline_01/test.desc
rename to regression/goto-instrument/inline_01/test.desc
diff --git a/regression/inlining/inline_02/main.c b/regression/goto-instrument/inline_02/main.c
similarity index 100%
rename from regression/inlining/inline_02/main.c
rename to regression/goto-instrument/inline_02/main.c
diff --git a/regression/inlining/inline_02/test.desc b/regression/goto-instrument/inline_02/test.desc
similarity index 100%
rename from regression/inlining/inline_02/test.desc
rename to regression/goto-instrument/inline_02/test.desc
diff --git a/regression/inlining/inline_03/main.c b/regression/goto-instrument/inline_03/main.c
similarity index 100%
rename from regression/inlining/inline_03/main.c
rename to regression/goto-instrument/inline_03/main.c
diff --git a/regression/inlining/inline_03/test.desc b/regression/goto-instrument/inline_03/test.desc
similarity index 100%
rename from regression/inlining/inline_03/test.desc
rename to regression/goto-instrument/inline_03/test.desc
diff --git a/regression/inlining/inline_04/main.c b/regression/goto-instrument/inline_04/main.c
similarity index 100%
rename from regression/inlining/inline_04/main.c
rename to regression/goto-instrument/inline_04/main.c
diff --git a/regression/inlining/inline_04/test.desc b/regression/goto-instrument/inline_04/test.desc
similarity index 100%
rename from regression/inlining/inline_04/test.desc
rename to regression/goto-instrument/inline_04/test.desc
diff --git a/regression/inlining/inline_05/main.c b/regression/goto-instrument/inline_05/main.c
similarity index 100%
rename from regression/inlining/inline_05/main.c
rename to regression/goto-instrument/inline_05/main.c
diff --git a/regression/inlining/inline_05/test.desc b/regression/goto-instrument/inline_05/test.desc
similarity index 100%
rename from regression/inlining/inline_05/test.desc
rename to regression/goto-instrument/inline_05/test.desc
diff --git a/regression/inlining/inline_06/main.c b/regression/goto-instrument/inline_06/main.c
similarity index 100%
rename from regression/inlining/inline_06/main.c
rename to regression/goto-instrument/inline_06/main.c
diff --git a/regression/inlining/inline_06/test.desc b/regression/goto-instrument/inline_06/test.desc
similarity index 100%
rename from regression/inlining/inline_06/test.desc
rename to regression/goto-instrument/inline_06/test.desc
diff --git a/regression/inlining/inline_07/main.c b/regression/goto-instrument/inline_07/main.c
similarity index 100%
rename from regression/inlining/inline_07/main.c
rename to regression/goto-instrument/inline_07/main.c
diff --git a/regression/inlining/inline_07/test.desc b/regression/goto-instrument/inline_07/test.desc
similarity index 100%
rename from regression/inlining/inline_07/test.desc
rename to regression/goto-instrument/inline_07/test.desc
diff --git a/regression/inlining/inline_08/main.c b/regression/goto-instrument/inline_08/main.c
similarity index 100%
rename from regression/inlining/inline_08/main.c
rename to regression/goto-instrument/inline_08/main.c
diff --git a/regression/inlining/inline_08/test.desc b/regression/goto-instrument/inline_08/test.desc
similarity index 100%
rename from regression/inlining/inline_08/test.desc
rename to regression/goto-instrument/inline_08/test.desc
diff --git a/regression/inlining/inline_09/main.c b/regression/goto-instrument/inline_09/main.c
similarity index 100%
rename from regression/inlining/inline_09/main.c
rename to regression/goto-instrument/inline_09/main.c
diff --git a/regression/inlining/inline_09/test.desc b/regression/goto-instrument/inline_09/test.desc
similarity index 100%
rename from regression/inlining/inline_09/test.desc
rename to regression/goto-instrument/inline_09/test.desc
diff --git a/regression/inlining/inline_10/main.c b/regression/goto-instrument/inline_10/main.c
similarity index 100%
rename from regression/inlining/inline_10/main.c
rename to regression/goto-instrument/inline_10/main.c
diff --git a/regression/inlining/inline_10/test.desc b/regression/goto-instrument/inline_10/test.desc
similarity index 100%
rename from regression/inlining/inline_10/test.desc
rename to regression/goto-instrument/inline_10/test.desc
diff --git a/regression/inlining/inline_11/main.c b/regression/goto-instrument/inline_11/main.c
similarity index 100%
rename from regression/inlining/inline_11/main.c
rename to regression/goto-instrument/inline_11/main.c
diff --git a/regression/inlining/inline_11/test.desc b/regression/goto-instrument/inline_11/test.desc
similarity index 100%
rename from regression/inlining/inline_11/test.desc
rename to regression/goto-instrument/inline_11/test.desc
diff --git a/regression/inlining/inline_12/main.c b/regression/goto-instrument/inline_12/main.c
similarity index 100%
rename from regression/inlining/inline_12/main.c
rename to regression/goto-instrument/inline_12/main.c
diff --git a/regression/inlining/inline_12/test.desc b/regression/goto-instrument/inline_12/test.desc
similarity index 100%
rename from regression/inlining/inline_12/test.desc
rename to regression/goto-instrument/inline_12/test.desc
diff --git a/regression/goto-instrument/slice-global-inits1/main.c b/regression/goto-instrument/slice-global-inits1/main.c
index 8ab123d1014..e61c1577ace 100644
--- a/regression/goto-instrument/slice-global-inits1/main.c
+++ b/regression/goto-instrument/slice-global-inits1/main.c
@@ -24,9 +24,10 @@ void func2()
   s2.a = 7;
 }
 
-void func3()
+void func3(int a)
 {
-  func3();
+  if(a>0)
+    func3(a-1);
 }
 
 int main()
@@ -36,7 +37,7 @@ int main()
 
   func2();
 
-  func3();
+  func3(1);
 
   return 0;
 }
diff --git a/regression/goto-instrument/slice-global-inits1/test.desc b/regression/goto-instrument/slice-global-inits1/test.desc
index 6e8a7deedeb..e6cfe4981f8 100644
--- a/regression/goto-instrument/slice-global-inits1/test.desc
+++ b/regression/goto-instrument/slice-global-inits1/test.desc
@@ -1,6 +1,6 @@
 CORE
 main.c
---slice-global-inits --show-goto-functions
+--slice-global-inits
 z = 0;$
 a =
 s2 =
diff --git a/regression/goto-instrument-unwind/assert1/main.c b/regression/goto-instrument/unwind-assert1/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/assert1/main.c
rename to regression/goto-instrument/unwind-assert1/main.c
diff --git a/regression/goto-instrument-unwind/assert1/test.desc b/regression/goto-instrument/unwind-assert1/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/assert1/test.desc
rename to regression/goto-instrument/unwind-assert1/test.desc
diff --git a/regression/goto-instrument-unwind/assert2/main.c b/regression/goto-instrument/unwind-assert2/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/assert2/main.c
rename to regression/goto-instrument/unwind-assert2/main.c
diff --git a/regression/goto-instrument-unwind/assert2/test.desc b/regression/goto-instrument/unwind-assert2/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/assert2/test.desc
rename to regression/goto-instrument/unwind-assert2/test.desc
diff --git a/regression/goto-instrument-unwind/assert3/main.c b/regression/goto-instrument/unwind-assert3/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/assert3/main.c
rename to regression/goto-instrument/unwind-assert3/main.c
diff --git a/regression/goto-instrument-unwind/assert3/test.desc b/regression/goto-instrument/unwind-assert3/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/assert3/test.desc
rename to regression/goto-instrument/unwind-assert3/test.desc
diff --git a/regression/goto-instrument-unwind/assume1/main.c b/regression/goto-instrument/unwind-assume1/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/assume1/main.c
rename to regression/goto-instrument/unwind-assume1/main.c
diff --git a/regression/goto-instrument-unwind/assume1/test.desc b/regression/goto-instrument/unwind-assume1/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/assume1/test.desc
rename to regression/goto-instrument/unwind-assume1/test.desc
diff --git a/regression/goto-instrument-unwind/assume2/main.c b/regression/goto-instrument/unwind-assume2/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/assume2/main.c
rename to regression/goto-instrument/unwind-assume2/main.c
diff --git a/regression/goto-instrument-unwind/assume2/test.desc b/regression/goto-instrument/unwind-assume2/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/assume2/test.desc
rename to regression/goto-instrument/unwind-assume2/test.desc
diff --git a/regression/goto-instrument-unwind/break-loop1/main.c b/regression/goto-instrument/unwind-break-loop1/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/break-loop1/main.c
rename to regression/goto-instrument/unwind-break-loop1/main.c
diff --git a/regression/goto-instrument-unwind/break-loop1/test.desc b/regression/goto-instrument/unwind-break-loop1/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/break-loop1/test.desc
rename to regression/goto-instrument/unwind-break-loop1/test.desc
diff --git a/regression/goto-instrument-unwind/break-loop2/main.c b/regression/goto-instrument/unwind-break-loop2/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/break-loop2/main.c
rename to regression/goto-instrument/unwind-break-loop2/main.c
diff --git a/regression/goto-instrument-unwind/break-loop2/test.desc b/regression/goto-instrument/unwind-break-loop2/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/break-loop2/test.desc
rename to regression/goto-instrument/unwind-break-loop2/test.desc
diff --git a/regression/goto-instrument-unwind/continue-as-loops1/main.c b/regression/goto-instrument/unwind-continue-as-loops1/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/continue-as-loops1/main.c
rename to regression/goto-instrument/unwind-continue-as-loops1/main.c
diff --git a/regression/goto-instrument-unwind/continue-as-loops1/test.desc b/regression/goto-instrument/unwind-continue-as-loops1/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/continue-as-loops1/test.desc
rename to regression/goto-instrument/unwind-continue-as-loops1/test.desc
diff --git a/regression/goto-instrument-unwind/continue-loop1/main.c b/regression/goto-instrument/unwind-continue-loop1/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/continue-loop1/main.c
rename to regression/goto-instrument/unwind-continue-loop1/main.c
diff --git a/regression/goto-instrument-unwind/continue-loop1/test.desc b/regression/goto-instrument/unwind-continue-loop1/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/continue-loop1/test.desc
rename to regression/goto-instrument/unwind-continue-loop1/test.desc
diff --git a/regression/goto-instrument-unwind/continue-loop2/main.c b/regression/goto-instrument/unwind-continue-loop2/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/continue-loop2/main.c
rename to regression/goto-instrument/unwind-continue-loop2/main.c
diff --git a/regression/goto-instrument-unwind/continue-loop2/test.desc b/regression/goto-instrument/unwind-continue-loop2/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/continue-loop2/test.desc
rename to regression/goto-instrument/unwind-continue-loop2/test.desc
diff --git a/regression/goto-instrument-unwind/do-while-loop1/main.c b/regression/goto-instrument/unwind-do-while-loop1/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/do-while-loop1/main.c
rename to regression/goto-instrument/unwind-do-while-loop1/main.c
diff --git a/regression/goto-instrument-unwind/do-while-loop1/test.desc b/regression/goto-instrument/unwind-do-while-loop1/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/do-while-loop1/test.desc
rename to regression/goto-instrument/unwind-do-while-loop1/test.desc
diff --git a/regression/goto-instrument-unwind/do-while-loop2/main.c b/regression/goto-instrument/unwind-do-while-loop2/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/do-while-loop2/main.c
rename to regression/goto-instrument/unwind-do-while-loop2/main.c
diff --git a/regression/goto-instrument-unwind/do-while-loop2/test.desc b/regression/goto-instrument/unwind-do-while-loop2/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/do-while-loop2/test.desc
rename to regression/goto-instrument/unwind-do-while-loop2/test.desc
diff --git a/regression/goto-instrument-unwind/empty-loop1/main.c b/regression/goto-instrument/unwind-empty-loop1/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/empty-loop1/main.c
rename to regression/goto-instrument/unwind-empty-loop1/main.c
diff --git a/regression/goto-instrument-unwind/empty-loop1/test.desc b/regression/goto-instrument/unwind-empty-loop1/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/empty-loop1/test.desc
rename to regression/goto-instrument/unwind-empty-loop1/test.desc
diff --git a/regression/goto-instrument-unwind/empty-loop2/main.c b/regression/goto-instrument/unwind-empty-loop2/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/empty-loop2/main.c
rename to regression/goto-instrument/unwind-empty-loop2/main.c
diff --git a/regression/goto-instrument-unwind/empty-loop2/test.desc b/regression/goto-instrument/unwind-empty-loop2/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/empty-loop2/test.desc
rename to regression/goto-instrument/unwind-empty-loop2/test.desc
diff --git a/regression/goto-instrument-unwind/nested-loops1/main.c b/regression/goto-instrument/unwind-nested-loops1/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/nested-loops1/main.c
rename to regression/goto-instrument/unwind-nested-loops1/main.c
diff --git a/regression/goto-instrument-unwind/nested-loops1/test.desc b/regression/goto-instrument/unwind-nested-loops1/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/nested-loops1/test.desc
rename to regression/goto-instrument/unwind-nested-loops1/test.desc
diff --git a/regression/goto-instrument-unwind/nested-loops2/main.c b/regression/goto-instrument/unwind-nested-loops2/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/nested-loops2/main.c
rename to regression/goto-instrument/unwind-nested-loops2/main.c
diff --git a/regression/goto-instrument-unwind/nested-loops2/test.desc b/regression/goto-instrument/unwind-nested-loops2/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/nested-loops2/test.desc
rename to regression/goto-instrument/unwind-nested-loops2/test.desc
diff --git a/regression/goto-instrument-unwind/simple-loop1/main.c b/regression/goto-instrument/unwind-simple-loop1/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/simple-loop1/main.c
rename to regression/goto-instrument/unwind-simple-loop1/main.c
diff --git a/regression/goto-instrument-unwind/simple-loop1/test.desc b/regression/goto-instrument/unwind-simple-loop1/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/simple-loop1/test.desc
rename to regression/goto-instrument/unwind-simple-loop1/test.desc
diff --git a/regression/goto-instrument-unwind/simple-loop2/main.c b/regression/goto-instrument/unwind-simple-loop2/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/simple-loop2/main.c
rename to regression/goto-instrument/unwind-simple-loop2/main.c
diff --git a/regression/goto-instrument-unwind/simple-loop2/test.desc b/regression/goto-instrument/unwind-simple-loop2/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/simple-loop2/test.desc
rename to regression/goto-instrument/unwind-simple-loop2/test.desc
diff --git a/regression/goto-instrument-unwind/unwind-log1/main.c b/regression/goto-instrument/unwind-unwind-log1/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/unwind-log1/main.c
rename to regression/goto-instrument/unwind-unwind-log1/main.c
diff --git a/regression/goto-instrument-unwind/unwind-log1/test.desc b/regression/goto-instrument/unwind-unwind-log1/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/unwind-log1/test.desc
rename to regression/goto-instrument/unwind-unwind-log1/test.desc
diff --git a/regression/goto-instrument-unwind/unwindset-file1/main.c b/regression/goto-instrument/unwind-unwindset-file1/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/unwindset-file1/main.c
rename to regression/goto-instrument/unwind-unwindset-file1/main.c
diff --git a/regression/goto-instrument-unwind/unwindset-file1/test.desc b/regression/goto-instrument/unwind-unwindset-file1/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/unwindset-file1/test.desc
rename to regression/goto-instrument/unwind-unwindset-file1/test.desc
diff --git a/regression/goto-instrument-unwind/unwindset-file1/unwindset.input b/regression/goto-instrument/unwind-unwindset-file1/unwindset.input
similarity index 100%
rename from regression/goto-instrument-unwind/unwindset-file1/unwindset.input
rename to regression/goto-instrument/unwind-unwindset-file1/unwindset.input
diff --git a/regression/goto-instrument-unwind/unwindset1/main.c b/regression/goto-instrument/unwind-unwindset1/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/unwindset1/main.c
rename to regression/goto-instrument/unwind-unwindset1/main.c
diff --git a/regression/goto-instrument-unwind/unwindset1/test.desc b/regression/goto-instrument/unwind-unwindset1/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/unwindset1/test.desc
rename to regression/goto-instrument/unwind-unwindset1/test.desc
diff --git a/regression/goto-instrument-unwind/unwindset2/main.c b/regression/goto-instrument/unwind-unwindset2/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/unwindset2/main.c
rename to regression/goto-instrument/unwind-unwindset2/main.c
diff --git a/regression/goto-instrument-unwind/unwindset2/test.desc b/regression/goto-instrument/unwind-unwindset2/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/unwindset2/test.desc
rename to regression/goto-instrument/unwind-unwindset2/test.desc
diff --git a/regression/goto-instrument-unwind/unwindset3/main.c b/regression/goto-instrument/unwind-unwindset3/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/unwindset3/main.c
rename to regression/goto-instrument/unwind-unwindset3/main.c
diff --git a/regression/goto-instrument-unwind/unwindset3/test.desc b/regression/goto-instrument/unwind-unwindset3/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/unwindset3/test.desc
rename to regression/goto-instrument/unwind-unwindset3/test.desc
diff --git a/regression/goto-instrument-unwind/unwindset4/main.c b/regression/goto-instrument/unwind-unwindset4/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/unwindset4/main.c
rename to regression/goto-instrument/unwind-unwindset4/main.c
diff --git a/regression/goto-instrument-unwind/unwindset4/test.desc b/regression/goto-instrument/unwind-unwindset4/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/unwindset4/test.desc
rename to regression/goto-instrument/unwind-unwindset4/test.desc
diff --git a/regression/goto-instrument-unwind/unwindset5/main.c b/regression/goto-instrument/unwind-unwindset5/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/unwindset5/main.c
rename to regression/goto-instrument/unwind-unwindset5/main.c
diff --git a/regression/goto-instrument-unwind/unwindset5/test.desc b/regression/goto-instrument/unwind-unwindset5/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/unwindset5/test.desc
rename to regression/goto-instrument/unwind-unwindset5/test.desc
diff --git a/regression/goto-instrument-unwind/zero-unwind1/main.c b/regression/goto-instrument/unwind-zero-unwind1/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/zero-unwind1/main.c
rename to regression/goto-instrument/unwind-zero-unwind1/main.c
diff --git a/regression/goto-instrument-unwind/zero-unwind1/test.desc b/regression/goto-instrument/unwind-zero-unwind1/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/zero-unwind1/test.desc
rename to regression/goto-instrument/unwind-zero-unwind1/test.desc
diff --git a/regression/goto-instrument-unwind/zero-unwind2/main.c b/regression/goto-instrument/unwind-zero-unwind2/main.c
similarity index 100%
rename from regression/goto-instrument-unwind/zero-unwind2/main.c
rename to regression/goto-instrument/unwind-zero-unwind2/main.c
diff --git a/regression/goto-instrument-unwind/zero-unwind2/test.desc b/regression/goto-instrument/unwind-zero-unwind2/test.desc
similarity index 100%
rename from regression/goto-instrument-unwind/zero-unwind2/test.desc
rename to regression/goto-instrument/unwind-zero-unwind2/test.desc
diff --git a/regression/inlining/Makefile b/regression/inlining/Makefile
deleted file mode 100644
index ad9e1fba484..00000000000
--- a/regression/inlining/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-default: tests.log
-
-test:
-	@./test.sh
-
-tests.log: ../test.pl
-	@./test.sh
-
-show:
-	@for dir in *; do \
-		if [ -d "$$dir" ]; then \
-			vim -o "$$dir/*.java" "$$dir/*.out"; \
-		fi; \
-	done;
-
-clean:
-	find . -name '*.*~' | xargs rm -f
-	find . -name '*.out' | xargs rm -f
-	find . -name '*.o' | xargs rm -f
-	rm -f tests.log	
diff --git a/regression/inlining/chain.sh b/regression/inlining/chain.sh
deleted file mode 100755
index ca99de27262..00000000000
--- a/regression/inlining/chain.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -e
-
-src=../../../src
-goto_cc=$src/goto-cc/goto-cc
-goto_instrument=$src/goto-instrument/goto-instrument
-cbmc=$src/cbmc/cbmc
-
-name=${@:$#}
-name=${name%.c}
-
-args=${@:1:$#-1}
-
-$goto_cc -o $name.o $name.c
-$goto_instrument $args $name.o $name-new.o
-$goto_instrument --show-goto-functions $name-new.o
-$cbmc $name-new.o
-
diff --git a/regression/inlining/test.sh b/regression/inlining/test.sh
deleted file mode 100755
index 8dd60cf2bc2..00000000000
--- a/regression/inlining/test.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-../test.pl -c '../chain.sh' $1