diff --git a/sim/GetLineNum.do b/sim/questa/GetLineNum.do
similarity index 100%
rename from sim/GetLineNum.do
rename to sim/questa/GetLineNum.do
diff --git a/sim/coverage-exclusions-rv64gc.do b/sim/questa/coverage-exclusions-rv64gc.do
similarity index 100%
rename from sim/coverage-exclusions-rv64gc.do
rename to sim/questa/coverage-exclusions-rv64gc.do
diff --git a/sim/fpga-wave.do b/sim/questa/fpga-wave.do
similarity index 100%
rename from sim/fpga-wave.do
rename to sim/questa/fpga-wave.do
diff --git a/sim/linux-wave.do b/sim/questa/linux-wave.do
similarity index 100%
rename from sim/linux-wave.do
rename to sim/questa/linux-wave.do
diff --git a/sim/testfloat-batch.do b/sim/questa/testfloat-batch.do
similarity index 100%
rename from sim/testfloat-batch.do
rename to sim/questa/testfloat-batch.do
diff --git a/sim/testfloat.do b/sim/questa/testfloat.do
similarity index 100%
rename from sim/testfloat.do
rename to sim/questa/testfloat.do
diff --git a/sim/wally-batch.do b/sim/questa/wally-batch.do
similarity index 82%
rename from sim/wally-batch.do
rename to sim/questa/wally-batch.do
index 4afe42202..f7c449272 100644
--- a/sim/wally-batch.do
+++ b/sim/questa/wally-batch.do
@@ -20,11 +20,15 @@
 
 onbreak {resume}
 
+set CONFIG ${1}
+set TESTSUITE ${2}
+set WKDIR wkdir/work_${CONFIG}_${TESTSUITE}
+
 # create library
-if [file exists wkdir/work_${1}_${2}] {
-    vdel -lib wkdir/work_${1}_${2} -all
+if [file exists ${WKDIR}] {
+    vdel -lib ${WKDIR} -all
 }
-vlib wkdir/work_${1}_${2}
+vlib ${WKDIR}
 # Create directory for coverage data
 mkdir -p cov
 
@@ -63,10 +67,7 @@ if {$argc >= 3} {
 # "Extra checking for conflicts with always_comb done at vopt time"
 # because vsim will run vopt
 
-# default to config/rv64ic, but allow this to be overridden at the command line.  For example:
-# do wally-pipelined-batch.do ../config/rv32imc rv32imc
-
-vlog -lint -work wkdir/work_${1}_${2} +incdir+../config/$1 +incdir+../config/deriv/$1 +incdir+../config/shared ../src/cvw.sv ../testbench/testbench.sv ../testbench/common/*.sv   ../src/*/*.sv ../src/*/*/*.sv -suppress 2583 -suppress 7063,2596,13286
+vlog -lint -work ${WKDIR} +incdir+../config/$1 +incdir+../config/deriv/$1 +incdir+../config/shared ../src/cvw.sv ../testbench/testbench.sv ../testbench/common/*.sv   ../src/*/*.sv ../src/*/*/*.sv -suppress 2583 -suppress 7063,2596,13286
 
 # start and run simulation
 # remove +acc flag for faster sim during regressions if there is no need to access internal signals
diff --git a/sim/wally-imperas-cov.do b/sim/questa/wally-imperas-cov.do
similarity index 100%
rename from sim/wally-imperas-cov.do
rename to sim/questa/wally-imperas-cov.do
diff --git a/sim/wally-imperas-no-idv.do b/sim/questa/wally-imperas-no-idv.do
similarity index 100%
rename from sim/wally-imperas-no-idv.do
rename to sim/questa/wally-imperas-no-idv.do
diff --git a/sim/wally-imperas.do b/sim/questa/wally-imperas.do
similarity index 100%
rename from sim/wally-imperas.do
rename to sim/questa/wally-imperas.do
diff --git a/sim/wally-linux-imperas.do b/sim/questa/wally-linux-imperas.do
similarity index 100%
rename from sim/wally-linux-imperas.do
rename to sim/questa/wally-linux-imperas.do
diff --git a/sim/wally.do b/sim/questa/wally.do
similarity index 100%
rename from sim/wally.do
rename to sim/questa/wally.do
diff --git a/sim/wave-all.do b/sim/questa/wave-all.do
similarity index 100%
rename from sim/wave-all.do
rename to sim/questa/wave-all.do
diff --git a/sim/wave-fpu.do b/sim/questa/wave-fpu.do
similarity index 100%
rename from sim/wave-fpu.do
rename to sim/questa/wave-fpu.do
diff --git a/sim/wave.do b/sim/questa/wave.do
similarity index 100%
rename from sim/wave.do
rename to sim/questa/wave.do