diff --git a/testbench/asm/hello_world2.s b/testbench/asm/hello_world2.s
deleted file mode 100644
index 8fa9c82..0000000
--- a/testbench/asm/hello_world2.s
+++ /dev/null
@@ -1,71 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-// Copyright 2019 Western Digital Corporation or its affiliates.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// Assembly code for Hello World 
-// Not using only ALU ops for creating the string
-
-
-#include "defines.h"
-
-#define STDOUT 0xd0580000
-
-
-// Code to execute 
-.section .text
-.global _start
-_start:
-
-    // Clear minstret
-    csrw minstret, zero
-    csrw minstreth, zero
-
-    // Set up MTVEC - not expecting to use it though 
-    li x1, RV_ICCM_SADR
-    csrw mtvec, x1
- 
- 
-    // Enable Caches in MRAC
-    li x1, 0x55555555
-    csrw 0x7c0, x1
- 
-    // Load string from hw_data
-    // and write to stdout address
- 
-    li x3, STDOUT
-    la x4, hw_data
-    
-loop:
-   lb x5, 0(x4)
-   sb x5, 0(x3)
-   addi x4, x4, 1
-   bnez x5, loop
-
-// Write 0xff to STDOUT for TB to termiate test.
-_finish:
-    li x3, STDOUT
-    addi x5, x0, 0xff
-    sb x5, 0(x3)
-    beq x0, x0, _finish
-.rept 100
-    nop
-.endr
-
-.data
-hw_data:
-.ascii "------------------------------------\n"
-.ascii "Hello World from SweRV EH1.4 @WDC !!\n"
-.ascii "------------------------------------"
-.byte 0
diff --git a/testbench/flist.questa b/testbench/flist.questa
deleted file mode 100644
index ee4c78f..0000000
--- a/testbench/flist.questa
+++ /dev/null
@@ -1,51 +0,0 @@
-$RV_ROOT/workspace/work/snapshots/default/common_defines.vh
-+incdir+$RV_ROOT/workspace/work/snapshots/default
-+incdir+$RV_ROOT/design/lib
-+incdir+$RV_ROOT/design/include
-+incdir+$RV_ROOT/design/dmi
-$RV_ROOT/design/swerv_wrapper.sv
-$RV_ROOT/design/mem.sv
-$RV_ROOT/design/pic_ctrl.sv
-$RV_ROOT/design/swerv.sv
-$RV_ROOT/design/dma_ctrl.sv
-$RV_ROOT/design/ifu/ifu_aln_ctl.sv
-$RV_ROOT/design/ifu/ifu_compress_ctl.sv
-$RV_ROOT/design/ifu/ifu_ifc_ctl.sv
-$RV_ROOT/design/ifu/ifu_bp_ctl.sv
-$RV_ROOT/design/ifu/ifu_ic_mem.sv
-$RV_ROOT/design/ifu/ifu_mem_ctl.sv
-$RV_ROOT/design/ifu/ifu_iccm_mem.sv
-$RV_ROOT/design/ifu/ifu.sv
-$RV_ROOT/design/dec/dec_decode_ctl.sv
-$RV_ROOT/design/dec/dec_gpr_ctl.sv
-$RV_ROOT/design/dec/dec_ib_ctl.sv
-$RV_ROOT/design/dec/dec_tlu_ctl.sv
-$RV_ROOT/design/dec/dec_trigger.sv
-$RV_ROOT/design/dec/dec.sv
-$RV_ROOT/design/exu/exu_alu_ctl.sv
-$RV_ROOT/design/exu/exu_mul_ctl.sv
-$RV_ROOT/design/exu/exu_div_ctl.sv
-$RV_ROOT/design/exu/exu.sv
-$RV_ROOT/design/lsu/lsu.sv
-$RV_ROOT/design/lsu/lsu_clkdomain.sv
-$RV_ROOT/design/lsu/lsu_addrcheck.sv
-$RV_ROOT/design/lsu/lsu_lsc_ctl.sv
-$RV_ROOT/design/lsu/lsu_stbuf.sv
-$RV_ROOT/design/lsu/lsu_bus_buffer.sv
-$RV_ROOT/design/lsu/lsu_bus_intf.sv
-$RV_ROOT/design/lsu/lsu_ecc.sv
-$RV_ROOT/design/lsu/lsu_dccm_mem.sv
-$RV_ROOT/design/lsu/lsu_dccm_ctl.sv
-$RV_ROOT/design/lsu/lsu_trigger.sv
-$RV_ROOT/design/dbg/dbg.sv
-$RV_ROOT/design/dmi/dmi_wrapper.v
-$RV_ROOT/design/dmi/dmi_jtag_to_core_sync.v
-$RV_ROOT/design/dmi/rvjtag_tap.sv
-$RV_ROOT/design/lib/beh_lib.sv
-$RV_ROOT/design/lib/mem_lib.sv
-$RV_ROOT/design/lib/svci_to_ahb.sv
-$RV_ROOT/design/lib/ahb_to_svci.sv
-$RV_ROOT/design/lib/svci_to_axi4.sv
-$RV_ROOT/design/lib/axi4_to_svci.sv
-$RV_ROOT/design/lib/ahb_to_axi4.sv
-$RV_ROOT/design/lib/axi4_to_ahb.sv
diff --git a/testbench/flist.spyglass b/testbench/flist.spyglass
deleted file mode 100644
index 8f8aa3d..0000000
--- a/testbench/flist.spyglass
+++ /dev/null
@@ -1,42 +0,0 @@
-$RV_ROOT/design/swerv_wrapper.sv
-$RV_ROOT/design/mem.sv
-$RV_ROOT/design/pic_ctrl.sv
-$RV_ROOT/design/swerv.sv
-$RV_ROOT/design/dma_ctrl.sv
-$RV_ROOT/design/ifu/ifu_aln_ctl.sv
-$RV_ROOT/design/ifu/ifu_compress_ctl.sv
-$RV_ROOT/design/ifu/ifu_ifc_ctl.sv
-$RV_ROOT/design/ifu/ifu_bp_ctl.sv
-$RV_ROOT/design/ifu/ifu_ic_mem.sv
-$RV_ROOT/design/ifu/ifu_mem_ctl.sv
-$RV_ROOT/design/ifu/ifu_iccm_mem.sv
-$RV_ROOT/design/ifu/ifu.sv
-$RV_ROOT/design/dec/dec_decode_ctl.sv
-$RV_ROOT/design/dec/dec_gpr_ctl.sv
-$RV_ROOT/design/dec/dec_ib_ctl.sv
-$RV_ROOT/design/dec/dec_tlu_ctl.sv
-$RV_ROOT/design/dec/dec_trigger.sv
-$RV_ROOT/design/dec/dec.sv
-$RV_ROOT/design/exu/exu_alu_ctl.sv
-$RV_ROOT/design/exu/exu_mul_ctl.sv
-$RV_ROOT/design/exu/exu_div_ctl.sv
-$RV_ROOT/design/exu/exu.sv
-$RV_ROOT/design/lsu/lsu.sv
-$RV_ROOT/design/lsu/lsu_clkdomain.sv
-$RV_ROOT/design/lsu/lsu_addrcheck.sv
-$RV_ROOT/design/lsu/lsu_lsc_ctl.sv
-$RV_ROOT/design/lsu/lsu_stbuf.sv
-$RV_ROOT/design/lsu/lsu_bus_buffer.sv
-$RV_ROOT/design/lsu/lsu_bus_intf.sv
-$RV_ROOT/design/lsu/lsu_ecc.sv
-$RV_ROOT/design/lsu/lsu_dccm_mem.sv
-$RV_ROOT/design/lsu/lsu_dccm_ctl.sv
-$RV_ROOT/design/lsu/lsu_trigger.sv
-$RV_ROOT/design/dbg/dbg.sv
-$RV_ROOT/design/dmi/dmi_wrapper.v
-$RV_ROOT/design/dmi/dmi_jtag_to_core_sync.v
-$RV_ROOT/design/dmi/rvjtag_tap.sv
-$RV_ROOT/design/lib/beh_lib.sv
-$RV_ROOT/design/lib/mem_lib.sv
-$RV_ROOT/design/lib/ahb_to_axi4.sv
-$RV_ROOT/design/lib/axi4_to_ahb.sv
diff --git a/testbench/flist.vcs b/testbench/flist.vcs
deleted file mode 100644
index 8f8aa3d..0000000
--- a/testbench/flist.vcs
+++ /dev/null
@@ -1,42 +0,0 @@
-$RV_ROOT/design/swerv_wrapper.sv
-$RV_ROOT/design/mem.sv
-$RV_ROOT/design/pic_ctrl.sv
-$RV_ROOT/design/swerv.sv
-$RV_ROOT/design/dma_ctrl.sv
-$RV_ROOT/design/ifu/ifu_aln_ctl.sv
-$RV_ROOT/design/ifu/ifu_compress_ctl.sv
-$RV_ROOT/design/ifu/ifu_ifc_ctl.sv
-$RV_ROOT/design/ifu/ifu_bp_ctl.sv
-$RV_ROOT/design/ifu/ifu_ic_mem.sv
-$RV_ROOT/design/ifu/ifu_mem_ctl.sv
-$RV_ROOT/design/ifu/ifu_iccm_mem.sv
-$RV_ROOT/design/ifu/ifu.sv
-$RV_ROOT/design/dec/dec_decode_ctl.sv
-$RV_ROOT/design/dec/dec_gpr_ctl.sv
-$RV_ROOT/design/dec/dec_ib_ctl.sv
-$RV_ROOT/design/dec/dec_tlu_ctl.sv
-$RV_ROOT/design/dec/dec_trigger.sv
-$RV_ROOT/design/dec/dec.sv
-$RV_ROOT/design/exu/exu_alu_ctl.sv
-$RV_ROOT/design/exu/exu_mul_ctl.sv
-$RV_ROOT/design/exu/exu_div_ctl.sv
-$RV_ROOT/design/exu/exu.sv
-$RV_ROOT/design/lsu/lsu.sv
-$RV_ROOT/design/lsu/lsu_clkdomain.sv
-$RV_ROOT/design/lsu/lsu_addrcheck.sv
-$RV_ROOT/design/lsu/lsu_lsc_ctl.sv
-$RV_ROOT/design/lsu/lsu_stbuf.sv
-$RV_ROOT/design/lsu/lsu_bus_buffer.sv
-$RV_ROOT/design/lsu/lsu_bus_intf.sv
-$RV_ROOT/design/lsu/lsu_ecc.sv
-$RV_ROOT/design/lsu/lsu_dccm_mem.sv
-$RV_ROOT/design/lsu/lsu_dccm_ctl.sv
-$RV_ROOT/design/lsu/lsu_trigger.sv
-$RV_ROOT/design/dbg/dbg.sv
-$RV_ROOT/design/dmi/dmi_wrapper.v
-$RV_ROOT/design/dmi/dmi_jtag_to_core_sync.v
-$RV_ROOT/design/dmi/rvjtag_tap.sv
-$RV_ROOT/design/lib/beh_lib.sv
-$RV_ROOT/design/lib/mem_lib.sv
-$RV_ROOT/design/lib/ahb_to_axi4.sv
-$RV_ROOT/design/lib/axi4_to_ahb.sv
diff --git a/testbench/flist.verilator b/testbench/flist.verilator
deleted file mode 100644
index 8f8aa3d..0000000
--- a/testbench/flist.verilator
+++ /dev/null
@@ -1,42 +0,0 @@
-$RV_ROOT/design/swerv_wrapper.sv
-$RV_ROOT/design/mem.sv
-$RV_ROOT/design/pic_ctrl.sv
-$RV_ROOT/design/swerv.sv
-$RV_ROOT/design/dma_ctrl.sv
-$RV_ROOT/design/ifu/ifu_aln_ctl.sv
-$RV_ROOT/design/ifu/ifu_compress_ctl.sv
-$RV_ROOT/design/ifu/ifu_ifc_ctl.sv
-$RV_ROOT/design/ifu/ifu_bp_ctl.sv
-$RV_ROOT/design/ifu/ifu_ic_mem.sv
-$RV_ROOT/design/ifu/ifu_mem_ctl.sv
-$RV_ROOT/design/ifu/ifu_iccm_mem.sv
-$RV_ROOT/design/ifu/ifu.sv
-$RV_ROOT/design/dec/dec_decode_ctl.sv
-$RV_ROOT/design/dec/dec_gpr_ctl.sv
-$RV_ROOT/design/dec/dec_ib_ctl.sv
-$RV_ROOT/design/dec/dec_tlu_ctl.sv
-$RV_ROOT/design/dec/dec_trigger.sv
-$RV_ROOT/design/dec/dec.sv
-$RV_ROOT/design/exu/exu_alu_ctl.sv
-$RV_ROOT/design/exu/exu_mul_ctl.sv
-$RV_ROOT/design/exu/exu_div_ctl.sv
-$RV_ROOT/design/exu/exu.sv
-$RV_ROOT/design/lsu/lsu.sv
-$RV_ROOT/design/lsu/lsu_clkdomain.sv
-$RV_ROOT/design/lsu/lsu_addrcheck.sv
-$RV_ROOT/design/lsu/lsu_lsc_ctl.sv
-$RV_ROOT/design/lsu/lsu_stbuf.sv
-$RV_ROOT/design/lsu/lsu_bus_buffer.sv
-$RV_ROOT/design/lsu/lsu_bus_intf.sv
-$RV_ROOT/design/lsu/lsu_ecc.sv
-$RV_ROOT/design/lsu/lsu_dccm_mem.sv
-$RV_ROOT/design/lsu/lsu_dccm_ctl.sv
-$RV_ROOT/design/lsu/lsu_trigger.sv
-$RV_ROOT/design/dbg/dbg.sv
-$RV_ROOT/design/dmi/dmi_wrapper.v
-$RV_ROOT/design/dmi/dmi_jtag_to_core_sync.v
-$RV_ROOT/design/dmi/rvjtag_tap.sv
-$RV_ROOT/design/lib/beh_lib.sv
-$RV_ROOT/design/lib/mem_lib.sv
-$RV_ROOT/design/lib/ahb_to_axi4.sv
-$RV_ROOT/design/lib/axi4_to_ahb.sv
diff --git a/testbench/flist.vlog b/testbench/flist.vlog
deleted file mode 100644
index 8f8aa3d..0000000
--- a/testbench/flist.vlog
+++ /dev/null
@@ -1,42 +0,0 @@
-$RV_ROOT/design/swerv_wrapper.sv
-$RV_ROOT/design/mem.sv
-$RV_ROOT/design/pic_ctrl.sv
-$RV_ROOT/design/swerv.sv
-$RV_ROOT/design/dma_ctrl.sv
-$RV_ROOT/design/ifu/ifu_aln_ctl.sv
-$RV_ROOT/design/ifu/ifu_compress_ctl.sv
-$RV_ROOT/design/ifu/ifu_ifc_ctl.sv
-$RV_ROOT/design/ifu/ifu_bp_ctl.sv
-$RV_ROOT/design/ifu/ifu_ic_mem.sv
-$RV_ROOT/design/ifu/ifu_mem_ctl.sv
-$RV_ROOT/design/ifu/ifu_iccm_mem.sv
-$RV_ROOT/design/ifu/ifu.sv
-$RV_ROOT/design/dec/dec_decode_ctl.sv
-$RV_ROOT/design/dec/dec_gpr_ctl.sv
-$RV_ROOT/design/dec/dec_ib_ctl.sv
-$RV_ROOT/design/dec/dec_tlu_ctl.sv
-$RV_ROOT/design/dec/dec_trigger.sv
-$RV_ROOT/design/dec/dec.sv
-$RV_ROOT/design/exu/exu_alu_ctl.sv
-$RV_ROOT/design/exu/exu_mul_ctl.sv
-$RV_ROOT/design/exu/exu_div_ctl.sv
-$RV_ROOT/design/exu/exu.sv
-$RV_ROOT/design/lsu/lsu.sv
-$RV_ROOT/design/lsu/lsu_clkdomain.sv
-$RV_ROOT/design/lsu/lsu_addrcheck.sv
-$RV_ROOT/design/lsu/lsu_lsc_ctl.sv
-$RV_ROOT/design/lsu/lsu_stbuf.sv
-$RV_ROOT/design/lsu/lsu_bus_buffer.sv
-$RV_ROOT/design/lsu/lsu_bus_intf.sv
-$RV_ROOT/design/lsu/lsu_ecc.sv
-$RV_ROOT/design/lsu/lsu_dccm_mem.sv
-$RV_ROOT/design/lsu/lsu_dccm_ctl.sv
-$RV_ROOT/design/lsu/lsu_trigger.sv
-$RV_ROOT/design/dbg/dbg.sv
-$RV_ROOT/design/dmi/dmi_wrapper.v
-$RV_ROOT/design/dmi/dmi_jtag_to_core_sync.v
-$RV_ROOT/design/dmi/rvjtag_tap.sv
-$RV_ROOT/design/lib/beh_lib.sv
-$RV_ROOT/design/lib/mem_lib.sv
-$RV_ROOT/design/lib/ahb_to_axi4.sv
-$RV_ROOT/design/lib/axi4_to_ahb.sv