diff --git a/regression/jbmc-strings/StringContains03/Test.class b/jbmc/regression/jbmc-strings/StringContains03/Test.class
similarity index 100%
rename from regression/jbmc-strings/StringContains03/Test.class
rename to jbmc/regression/jbmc-strings/StringContains03/Test.class
diff --git a/regression/jbmc-strings/StringContains03/Test.java b/jbmc/regression/jbmc-strings/StringContains03/Test.java
similarity index 100%
rename from regression/jbmc-strings/StringContains03/Test.java
rename to jbmc/regression/jbmc-strings/StringContains03/Test.java
diff --git a/regression/jbmc-strings/StringContains03/test.desc b/jbmc/regression/jbmc-strings/StringContains03/test.desc
similarity index 100%
rename from regression/jbmc-strings/StringContains03/test.desc
rename to jbmc/regression/jbmc-strings/StringContains03/test.desc
diff --git a/regression/cbmc-java/NondetCharSequence/NondetCharSequence.class b/jbmc/regression/jbmc/NondetCharSequence/NondetCharSequence.class
similarity index 100%
rename from regression/cbmc-java/NondetCharSequence/NondetCharSequence.class
rename to jbmc/regression/jbmc/NondetCharSequence/NondetCharSequence.class
diff --git a/regression/cbmc-java/NondetCharSequence/NondetCharSequence.java b/jbmc/regression/jbmc/NondetCharSequence/NondetCharSequence.java
similarity index 100%
rename from regression/cbmc-java/NondetCharSequence/NondetCharSequence.java
rename to jbmc/regression/jbmc/NondetCharSequence/NondetCharSequence.java
diff --git a/regression/cbmc-java/NondetCharSequence/test.desc b/jbmc/regression/jbmc/NondetCharSequence/test.desc
similarity index 100%
rename from regression/cbmc-java/NondetCharSequence/test.desc
rename to jbmc/regression/jbmc/NondetCharSequence/test.desc
diff --git a/regression/cbmc-java/NondetString/NondetString.class b/jbmc/regression/jbmc/NondetString/NondetString.class
similarity index 100%
rename from regression/cbmc-java/NondetString/NondetString.class
rename to jbmc/regression/jbmc/NondetString/NondetString.class
diff --git a/regression/cbmc-java/NondetString/NondetString.java b/jbmc/regression/jbmc/NondetString/NondetString.java
similarity index 100%
rename from regression/cbmc-java/NondetString/NondetString.java
rename to jbmc/regression/jbmc/NondetString/NondetString.java
diff --git a/regression/cbmc-java/NondetString/test.desc b/jbmc/regression/jbmc/NondetString/test.desc
similarity index 100%
rename from regression/cbmc-java/NondetString/test.desc
rename to jbmc/regression/jbmc/NondetString/test.desc
diff --git a/regression/cbmc-java/NondetStringBuffer/NondetStringBuffer.class b/jbmc/regression/jbmc/NondetStringBuffer/NondetStringBuffer.class
similarity index 100%
rename from regression/cbmc-java/NondetStringBuffer/NondetStringBuffer.class
rename to jbmc/regression/jbmc/NondetStringBuffer/NondetStringBuffer.class
diff --git a/regression/cbmc-java/NondetStringBuffer/NondetStringBuffer.java b/jbmc/regression/jbmc/NondetStringBuffer/NondetStringBuffer.java
similarity index 100%
rename from regression/cbmc-java/NondetStringBuffer/NondetStringBuffer.java
rename to jbmc/regression/jbmc/NondetStringBuffer/NondetStringBuffer.java
diff --git a/regression/cbmc-java/NondetStringBuffer/test.desc b/jbmc/regression/jbmc/NondetStringBuffer/test.desc
similarity index 100%
rename from regression/cbmc-java/NondetStringBuffer/test.desc
rename to jbmc/regression/jbmc/NondetStringBuffer/test.desc
diff --git a/regression/cbmc-java/NondetStringBuilder/NondetStringBuilder.class b/jbmc/regression/jbmc/NondetStringBuilder/NondetStringBuilder.class
similarity index 100%
rename from regression/cbmc-java/NondetStringBuilder/NondetStringBuilder.class
rename to jbmc/regression/jbmc/NondetStringBuilder/NondetStringBuilder.class
diff --git a/regression/cbmc-java/NondetStringBuilder/NondetStringBuilder.java b/jbmc/regression/jbmc/NondetStringBuilder/NondetStringBuilder.java
similarity index 100%
rename from regression/cbmc-java/NondetStringBuilder/NondetStringBuilder.java
rename to jbmc/regression/jbmc/NondetStringBuilder/NondetStringBuilder.java
diff --git a/regression/cbmc-java/NondetStringBuilder/test.desc b/jbmc/regression/jbmc/NondetStringBuilder/test.desc
similarity index 100%
rename from regression/cbmc-java/NondetStringBuilder/test.desc
rename to jbmc/regression/jbmc/NondetStringBuilder/test.desc
diff --git a/regression/cbmc-java/repeated_guards/A.class b/jbmc/regression/jbmc/repeated_guards/A.class
similarity index 100%
rename from regression/cbmc-java/repeated_guards/A.class
rename to jbmc/regression/jbmc/repeated_guards/A.class
diff --git a/regression/cbmc-java/repeated_guards/B.class b/jbmc/regression/jbmc/repeated_guards/B.class
similarity index 100%
rename from regression/cbmc-java/repeated_guards/B.class
rename to jbmc/regression/jbmc/repeated_guards/B.class
diff --git a/regression/cbmc-java/repeated_guards/Test.class b/jbmc/regression/jbmc/repeated_guards/Test.class
similarity index 100%
rename from regression/cbmc-java/repeated_guards/Test.class
rename to jbmc/regression/jbmc/repeated_guards/Test.class
diff --git a/regression/cbmc-java/repeated_guards/Test.java b/jbmc/regression/jbmc/repeated_guards/Test.java
similarity index 100%
rename from regression/cbmc-java/repeated_guards/Test.java
rename to jbmc/regression/jbmc/repeated_guards/Test.java
diff --git a/regression/cbmc-java/repeated_guards/test_arraybounds.desc b/jbmc/regression/jbmc/repeated_guards/test_arraybounds.desc
similarity index 100%
rename from regression/cbmc-java/repeated_guards/test_arraybounds.desc
rename to jbmc/regression/jbmc/repeated_guards/test_arraybounds.desc
diff --git a/regression/cbmc-java/repeated_guards/test_arraycreation.desc b/jbmc/regression/jbmc/repeated_guards/test_arraycreation.desc
similarity index 100%
rename from regression/cbmc-java/repeated_guards/test_arraycreation.desc
rename to jbmc/regression/jbmc/repeated_guards/test_arraycreation.desc
diff --git a/regression/cbmc-java/repeated_guards/test_assertion.desc b/jbmc/regression/jbmc/repeated_guards/test_assertion.desc
similarity index 100%
rename from regression/cbmc-java/repeated_guards/test_assertion.desc
rename to jbmc/regression/jbmc/repeated_guards/test_assertion.desc
diff --git a/regression/cbmc-java/repeated_guards/test_classcast.desc b/jbmc/regression/jbmc/repeated_guards/test_classcast.desc
similarity index 100%
rename from regression/cbmc-java/repeated_guards/test_classcast.desc
rename to jbmc/regression/jbmc/repeated_guards/test_classcast.desc
diff --git a/regression/cbmc-java/repeated_guards/test_divbyzero.desc b/jbmc/regression/jbmc/repeated_guards/test_divbyzero.desc
similarity index 100%
rename from regression/cbmc-java/repeated_guards/test_divbyzero.desc
rename to jbmc/regression/jbmc/repeated_guards/test_divbyzero.desc
diff --git a/regression/cbmc-java/repeated_guards/test_nullderef.desc b/jbmc/regression/jbmc/repeated_guards/test_nullderef.desc
similarity index 100%
rename from regression/cbmc-java/repeated_guards/test_nullderef.desc
rename to jbmc/regression/jbmc/repeated_guards/test_nullderef.desc