diff --git a/regression/verilog/bit-extract/bit-extract1.desc b/regression/verilog/expressions/bit-extract1.desc
similarity index 100%
rename from regression/verilog/bit-extract/bit-extract1.desc
rename to regression/verilog/expressions/bit-extract1.desc
diff --git a/regression/verilog/bit-extract/bit-extract1.v b/regression/verilog/expressions/bit-extract1.v
similarity index 100%
rename from regression/verilog/bit-extract/bit-extract1.v
rename to regression/verilog/expressions/bit-extract1.v
diff --git a/regression/verilog/bit-extract/bit-extract2.desc b/regression/verilog/expressions/bit-extract2.desc
similarity index 100%
rename from regression/verilog/bit-extract/bit-extract2.desc
rename to regression/verilog/expressions/bit-extract2.desc
diff --git a/regression/verilog/bit-extract/bit-extract2.v b/regression/verilog/expressions/bit-extract2.v
similarity index 100%
rename from regression/verilog/bit-extract/bit-extract2.v
rename to regression/verilog/expressions/bit-extract2.v
diff --git a/regression/verilog/bit-extract/bit-extract3.desc b/regression/verilog/expressions/bit-extract3.desc
similarity index 100%
rename from regression/verilog/bit-extract/bit-extract3.desc
rename to regression/verilog/expressions/bit-extract3.desc
diff --git a/regression/verilog/bit-extract/bit-extract3.sv b/regression/verilog/expressions/bit-extract3.sv
similarity index 100%
rename from regression/verilog/bit-extract/bit-extract3.sv
rename to regression/verilog/expressions/bit-extract3.sv
diff --git a/regression/verilog/bit-extract/bit-extract4.desc b/regression/verilog/expressions/bit-extract4.desc
similarity index 100%
rename from regression/verilog/bit-extract/bit-extract4.desc
rename to regression/verilog/expressions/bit-extract4.desc
diff --git a/regression/verilog/bit-extract/bit-extract4.sv b/regression/verilog/expressions/bit-extract4.sv
similarity index 100%
rename from regression/verilog/bit-extract/bit-extract4.sv
rename to regression/verilog/expressions/bit-extract4.sv
diff --git a/regression/verilog/concatenation/concatenation1.desc b/regression/verilog/expressions/concatenation1.desc
similarity index 100%
rename from regression/verilog/concatenation/concatenation1.desc
rename to regression/verilog/expressions/concatenation1.desc
diff --git a/regression/verilog/concatenation/concatenation1.v b/regression/verilog/expressions/concatenation1.v
similarity index 100%
rename from regression/verilog/concatenation/concatenation1.v
rename to regression/verilog/expressions/concatenation1.v
diff --git a/regression/verilog/concatenation/concatenation2.desc b/regression/verilog/expressions/concatenation2.desc
similarity index 100%
rename from regression/verilog/concatenation/concatenation2.desc
rename to regression/verilog/expressions/concatenation2.desc
diff --git a/regression/verilog/concatenation/concatenation2.v b/regression/verilog/expressions/concatenation2.v
similarity index 100%
rename from regression/verilog/concatenation/concatenation2.v
rename to regression/verilog/expressions/concatenation2.v
diff --git a/regression/verilog/shr1/test.desc b/regression/verilog/expressions/constants1.desc
similarity index 81%
rename from regression/verilog/shr1/test.desc
rename to regression/verilog/expressions/constants1.desc
index 6951d7524..b133bca1c 100644
--- a/regression/verilog/shr1/test.desc
+++ b/regression/verilog/expressions/constants1.desc
@@ -1,5 +1,5 @@
 CORE
-main.v
+constants1.v
 --bound 1
 ^EXIT=0$
 ^SIGNAL=0$
diff --git a/regression/verilog/constants1/main.v b/regression/verilog/expressions/constants1.v
similarity index 100%
rename from regression/verilog/constants1/main.v
rename to regression/verilog/expressions/constants1.v
diff --git a/regression/verilog/part-select/index-of-real.desc b/regression/verilog/expressions/index-of-real.desc
similarity index 100%
rename from regression/verilog/part-select/index-of-real.desc
rename to regression/verilog/expressions/index-of-real.desc
diff --git a/regression/verilog/part-select/index-of-real.sv b/regression/verilog/expressions/index-of-real.sv
similarity index 100%
rename from regression/verilog/part-select/index-of-real.sv
rename to regression/verilog/expressions/index-of-real.sv
diff --git a/regression/verilog/part-select/part-select-of-real.desc b/regression/verilog/expressions/part-select-of-real.desc
similarity index 100%
rename from regression/verilog/part-select/part-select-of-real.desc
rename to regression/verilog/expressions/part-select-of-real.desc
diff --git a/regression/verilog/part-select/part-select-of-real.sv b/regression/verilog/expressions/part-select-of-real.sv
similarity index 100%
rename from regression/verilog/part-select/part-select-of-real.sv
rename to regression/verilog/expressions/part-select-of-real.sv
diff --git a/regression/verilog/part-select/real-index.desc b/regression/verilog/expressions/real-index.desc
similarity index 100%
rename from regression/verilog/part-select/real-index.desc
rename to regression/verilog/expressions/real-index.desc
diff --git a/regression/verilog/part-select/real-index.sv b/regression/verilog/expressions/real-index.sv
similarity index 100%
rename from regression/verilog/part-select/real-index.sv
rename to regression/verilog/expressions/real-index.sv
diff --git a/regression/verilog/replication/replication1.desc b/regression/verilog/expressions/replication1.desc
similarity index 100%
rename from regression/verilog/replication/replication1.desc
rename to regression/verilog/expressions/replication1.desc
diff --git a/regression/verilog/replication/replication1.v b/regression/verilog/expressions/replication1.v
similarity index 100%
rename from regression/verilog/replication/replication1.v
rename to regression/verilog/expressions/replication1.v
diff --git a/regression/verilog/constants1/test.desc b/regression/verilog/expressions/shr1.desc
similarity index 89%
rename from regression/verilog/constants1/test.desc
rename to regression/verilog/expressions/shr1.desc
index 6951d7524..c8ecde3b5 100644
--- a/regression/verilog/constants1/test.desc
+++ b/regression/verilog/expressions/shr1.desc
@@ -1,5 +1,5 @@
 CORE
-main.v
+shr1.v
 --bound 1
 ^EXIT=0$
 ^SIGNAL=0$
diff --git a/regression/verilog/shr1/main.v b/regression/verilog/expressions/shr1.v
similarity index 100%
rename from regression/verilog/shr1/main.v
rename to regression/verilog/expressions/shr1.v
diff --git a/regression/verilog/casts/size_cast1.desc b/regression/verilog/expressions/size_cast1.desc
similarity index 100%
rename from regression/verilog/casts/size_cast1.desc
rename to regression/verilog/expressions/size_cast1.desc
diff --git a/regression/verilog/casts/size_cast1.sv b/regression/verilog/expressions/size_cast1.sv
similarity index 100%
rename from regression/verilog/casts/size_cast1.sv
rename to regression/verilog/expressions/size_cast1.sv
diff --git a/regression/verilog/casts/static_cast1.desc b/regression/verilog/expressions/static_cast1.desc
similarity index 100%
rename from regression/verilog/casts/static_cast1.desc
rename to regression/verilog/expressions/static_cast1.desc
diff --git a/regression/verilog/casts/static_cast1.sv b/regression/verilog/expressions/static_cast1.sv
similarity index 100%
rename from regression/verilog/casts/static_cast1.sv
rename to regression/verilog/expressions/static_cast1.sv