diff --git a/flist/accelerator-wrapper_src.flist b/flist/accelerator-wrapper_src.flist
index 1ab862ab92c846c13bb38fa92cf6087a19e153cf..813546e6cc803006376050b4ccebee2becd345d4 100644
--- a/flist/accelerator-wrapper_src.flist
+++ b/flist/accelerator-wrapper_src.flist
@@ -16,10 +16,11 @@
 +libext+.v+.vlib
 
 // =============    Accelerator Module search path    =============
--y $DESIGN/accelerator-wrapper/hdl/src/
-+incdir+$DESIGN/accelerator-wrapper/hdl/src/
+-y $(WRAP_ACC_DIR)/hdl/src/
++incdir+$(WRAP_ACC_DIR)/hdl/src/
 
-$DESIGN/accelerator-wrapper/hdl/src/wrapper_ahb_interface.sv
-$DESIGN/accelerator-wrapper/hdl/src/wrapper_packet_construct.sv
-$DESIGN/accelerator-wrapper/hdl/src/wrapper_packet_deconstruct.sv
-$DESIGN/accelerator-wrapper/hdl/src/wrapper_sha256_hashing_stream.sv
\ No newline at end of file
+$(WRAP_ACC_DIR)/hdl/src/wrapper_ahb_reg_interface.sv
+$(WRAP_ACC_DIR)/hdl/src/wrapper_ahb_to_vr_interface.sv
+$(WRAP_ACC_DIR)/hdl/src/wrapper_packet_construct.sv
+$(WRAP_ACC_DIR)/hdl/src/wrapper_packet_deconstruct.sv
+$(WRAP_ACC_DIR)/hdl/src/wrapper_sha256_hashing_stream.sv
\ No newline at end of file
diff --git a/flow/simulators/ivlog_sim.sh b/flow/simulators/ivlog_sim.sh
index a956e4dab9b839d04c7ae192c347fb524316036d..48dbfcd7edc107db20b73d032a4c1e8de007f96f 100755
--- a/flow/simulators/ivlog_sim.sh
+++ b/flow/simulators/ivlog_sim.sh
@@ -12,5 +12,5 @@
 #!/usr/bin/env bash
 
 mkdir -p $SOC_TOP/simulate/sim/ 
-iverilog -I $SOC_TOP/hdl/verif/ -I $SOC_TOP/hdl/verif/submodules -I $SOC_TOP/hdl/src/ -I $SHA_2_ACC_DIR/hdl/src/ -g2012 -o $SOC_TOP/simulate/sim/$1.vvp $SOC_TOP/hdl/verif/tb_$1.sv
+iverilog -c $WRAP_ACC_DIR/flist/*.flist -c $ACC_ENGINE_DIR/flist/*.flist -I $SOC_TOP/hdl/verif/ -I $SOC_TOP/hdl/verif/submodules -I $SOC_TOP/hdl/src/ -I $ACC_ENGINE_DIR/hdl/src/ -g2012 -o $SOC_TOP/simulate/sim/$1.vvp $SOC_TOP/hdl/verif/tb_$1.sv
 cd $SOC_TOP/simulate/sim/ && vvp $1.vvp $2
\ No newline at end of file
diff --git a/flow/stimgen.py b/flow/stimgen.py
index 2201b73164f52a22059a7dc0bec8facdf8b4f51b..5e3c556f82ae863b2f01ed373dcd1a5041d63907 100644
--- a/flow/stimgen.py
+++ b/flow/stimgen.py
@@ -205,6 +205,6 @@ if __name__ == "__main__":
     accelerator_input_size = 0x0000_0800
     accelerator_output_address = 0x6001_0800
     accelerator_output_size = 0x0000_0800
-    stim_file = os.environ["SHA_2_ACC_DIR"] + "/simulate/stimulus/system/" + "input_data_32bit_stim.csv"
-    ref_file = os.environ["SHA_2_ACC_DIR"] + "/simulate/stimulus/system/" + "output_hash_32bit_ref.csv"
+    stim_file = os.environ["ACC_ENGINE_DIR"] + "/simulate/stimulus/system/" + "input_data_32bit_stim.csv"
+    ref_file = os.environ["ACC_ENGINE_DIR"] + "/simulate/stimulus/system/" + "output_hash_32bit_ref.csv"
     stimulus_generation(stim_file, ref_file, accelerator_input_address, accelerator_input_size, accelerator_output_address, accelerator_output_size)
\ No newline at end of file
diff --git a/hdl/src/wrapper_sha256_hashing_stream.sv b/hdl/src/wrapper_sha256_hashing_stream.sv
index ae9fa89a8ffc642ebfd9a6fc23d6ec20bca10ec3..81ff2a9d27536140b1e3a1160c0cbee344b42c9d 100644
--- a/hdl/src/wrapper_sha256_hashing_stream.sv
+++ b/hdl/src/wrapper_sha256_hashing_stream.sv
@@ -35,10 +35,6 @@
 //            each register can be accessed by byte, half word or word.
 //            The example slave always output ready and OKAY response to the master
 //-----------------------------------------------------------------------------
-// `include "wrapper_packet_construct.sv"
-// `include "wrapper_packet_deconstruct.sv"
-// `include "wrapper_ahb_interface.sv"
-// `include "sha256_hashing_stream.sv"
 
 module wrapper_sha256_hashing_stream #(
   parameter ADDRWIDTH=12