diff --git a/wally-pipelined/testgen/privileged/README.md b/tests/testgen/privileged/README.md
similarity index 100%
rename from wally-pipelined/testgen/privileged/README.md
rename to tests/testgen/privileged/README.md
diff --git a/wally-pipelined/testgen/privileged/run.sh b/tests/testgen/privileged/run.sh
similarity index 100%
rename from wally-pipelined/testgen/privileged/run.sh
rename to tests/testgen/privileged/run.sh
diff --git a/wally-pipelined/testgen/privileged/testgen-CAUSE.py b/tests/testgen/privileged/testgen-CAUSE.py
similarity index 100%
rename from wally-pipelined/testgen/privileged/testgen-CAUSE.py
rename to tests/testgen/privileged/testgen-CAUSE.py
diff --git a/wally-pipelined/testgen/privileged/testgen-CSR-PERMISSIONS.py b/tests/testgen/privileged/testgen-CSR-PERMISSIONS.py
similarity index 100%
rename from wally-pipelined/testgen/privileged/testgen-CSR-PERMISSIONS.py
rename to tests/testgen/privileged/testgen-CSR-PERMISSIONS.py
diff --git a/wally-pipelined/testgen/privileged/testgen-DELEG.py b/tests/testgen/privileged/testgen-DELEG.py
similarity index 100%
rename from wally-pipelined/testgen/privileged/testgen-DELEG.py
rename to tests/testgen/privileged/testgen-DELEG.py
diff --git a/wally-pipelined/testgen/privileged/testgen-EPC.py b/tests/testgen/privileged/testgen-EPC.py
similarity index 100%
rename from wally-pipelined/testgen/privileged/testgen-EPC.py
rename to tests/testgen/privileged/testgen-EPC.py
diff --git a/wally-pipelined/testgen/privileged/testgen-IE.py b/tests/testgen/privileged/testgen-IE.py
similarity index 100%
rename from wally-pipelined/testgen/privileged/testgen-IE.py
rename to tests/testgen/privileged/testgen-IE.py
diff --git a/wally-pipelined/testgen/privileged/testgen-IP.py b/tests/testgen/privileged/testgen-IP.py
similarity index 100%
rename from wally-pipelined/testgen/privileged/testgen-IP.py
rename to tests/testgen/privileged/testgen-IP.py
diff --git a/wally-pipelined/testgen/privileged/testgen-READONLY.py b/tests/testgen/privileged/testgen-READONLY.py
similarity index 100%
rename from wally-pipelined/testgen/privileged/testgen-READONLY.py
rename to tests/testgen/privileged/testgen-READONLY.py
diff --git a/wally-pipelined/testgen/privileged/testgen-RET.py b/tests/testgen/privileged/testgen-RET.py
similarity index 100%
rename from wally-pipelined/testgen/privileged/testgen-RET.py
rename to tests/testgen/privileged/testgen-RET.py
diff --git a/wally-pipelined/testgen/privileged/testgen-TVAL.py b/tests/testgen/privileged/testgen-TVAL.py
similarity index 100%
rename from wally-pipelined/testgen/privileged/testgen-TVAL.py
rename to tests/testgen/privileged/testgen-TVAL.py
diff --git a/wally-pipelined/testgen/privileged/testgen-TVEC.py b/tests/testgen/privileged/testgen-TVEC.py
similarity index 100%
rename from wally-pipelined/testgen/privileged/testgen-TVEC.py
rename to tests/testgen/privileged/testgen-TVEC.py
diff --git a/wally-pipelined/testgen/testgen-ADD-SUB-SLT-SLTU-XOR-OR-AND.py b/tests/testgen/testgen-ADD-SUB-SLT-SLTU-XOR-OR-AND.py
similarity index 100%
rename from wally-pipelined/testgen/testgen-ADD-SUB-SLT-SLTU-XOR-OR-AND.py
rename to tests/testgen/testgen-ADD-SUB-SLT-SLTU-XOR-OR-AND.py
diff --git a/wally-pipelined/testgen/testgen-ADDI-XORI-ORI-ANDI-SLTI.py b/tests/testgen/testgen-ADDI-XORI-ORI-ANDI-SLTI.py
similarity index 100%
rename from wally-pipelined/testgen/testgen-ADDI-XORI-ORI-ANDI-SLTI.py
rename to tests/testgen/testgen-ADDI-XORI-ORI-ANDI-SLTI.py
diff --git a/wally-pipelined/testgen/testgen-ADDIW-SLLIW-SRLIW-SRAIW.py b/tests/testgen/testgen-ADDIW-SLLIW-SRLIW-SRAIW.py
similarity index 100%
rename from wally-pipelined/testgen/testgen-ADDIW-SLLIW-SRLIW-SRAIW.py
rename to tests/testgen/testgen-ADDIW-SLLIW-SRLIW-SRAIW.py
diff --git a/wally-pipelined/testgen/testgen-ADDW-SUBW-SLLW-SRLW-SRAW.py b/tests/testgen/testgen-ADDW-SUBW-SLLW-SRLW-SRAW.py
similarity index 100%
rename from wally-pipelined/testgen/testgen-ADDW-SUBW-SLLW-SRLW-SRAW.py
rename to tests/testgen/testgen-ADDW-SUBW-SLLW-SRLW-SRAW.py
diff --git a/wally-pipelined/testgen/testgen-BRANCH.py b/tests/testgen/testgen-BRANCH.py
similarity index 100%
rename from wally-pipelined/testgen/testgen-BRANCH.py
rename to tests/testgen/testgen-BRANCH.py
diff --git a/wally-pipelined/testgen/testgen-CSR.py b/tests/testgen/testgen-CSR.py
similarity index 100%
rename from wally-pipelined/testgen/testgen-CSR.py
rename to tests/testgen/testgen-CSR.py
diff --git a/wally-pipelined/testgen/testgen-JAL-JALR.py b/tests/testgen/testgen-JAL-JALR.py
similarity index 100%
rename from wally-pipelined/testgen/testgen-JAL-JALR.py
rename to tests/testgen/testgen-JAL-JALR.py
diff --git a/wally-pipelined/testgen/testgen-LOAD.py b/tests/testgen/testgen-LOAD.py
similarity index 100%
rename from wally-pipelined/testgen/testgen-LOAD.py
rename to tests/testgen/testgen-LOAD.py
diff --git a/wally-pipelined/testgen/testgen-PIPELINE.py b/tests/testgen/testgen-PIPELINE.py
similarity index 100%
rename from wally-pipelined/testgen/testgen-PIPELINE.py
rename to tests/testgen/testgen-PIPELINE.py
diff --git a/wally-pipelined/testgen/testgen-SLL-SRL-SRA.py b/tests/testgen/testgen-SLL-SRL-SRA.py
similarity index 100%
rename from wally-pipelined/testgen/testgen-SLL-SRL-SRA.py
rename to tests/testgen/testgen-SLL-SRL-SRA.py
diff --git a/wally-pipelined/testgen/testgen-SLLI-SRLI-SRAI.py b/tests/testgen/testgen-SLLI-SRLI-SRAI.py
similarity index 100%
rename from wally-pipelined/testgen/testgen-SLLI-SRLI-SRAI.py
rename to tests/testgen/testgen-SLLI-SRLI-SRAI.py
diff --git a/wally-pipelined/testgen/testgen-SLTIU.py b/tests/testgen/testgen-SLTIU.py
similarity index 100%
rename from wally-pipelined/testgen/testgen-SLTIU.py
rename to tests/testgen/testgen-SLTIU.py
diff --git a/wally-pipelined/testgen/testgen-STORE.py b/tests/testgen/testgen-STORE.py
similarity index 100%
rename from wally-pipelined/testgen/testgen-STORE.py
rename to tests/testgen/testgen-STORE.py
diff --git a/wally-pipelined/testgen/testgen-VIRTUALMEMORY.py b/tests/testgen/testgen-VIRTUALMEMORY.py
similarity index 100%
rename from wally-pipelined/testgen/testgen-VIRTUALMEMORY.py
rename to tests/testgen/testgen-VIRTUALMEMORY.py
diff --git a/wally-pipelined/testgen/testgen_footer.S b/tests/testgen/testgen_footer.S
similarity index 100%
rename from wally-pipelined/testgen/testgen_footer.S
rename to tests/testgen/testgen_footer.S
diff --git a/wally-pipelined/testgen/testgen_header.S b/tests/testgen/testgen_header.S
similarity index 100%
rename from wally-pipelined/testgen/testgen_header.S
rename to tests/testgen/testgen_header.S
diff --git a/wally-pipelined/testgen/virtual_memory_util.py b/tests/testgen/virtual_memory_util.py
similarity index 100%
rename from wally-pipelined/testgen/virtual_memory_util.py
rename to tests/testgen/virtual_memory_util.py