diff --git a/.github/workflows/scenario-CoupledL2.yml b/.github/workflows/scenario-CoupledL2.yml
index 29549bd..37789ae 100644
--- a/.github/workflows/scenario-CoupledL2.yml
+++ b/.github/workflows/scenario-CoupledL2.yml
@@ -84,11 +84,13 @@ jobs:
       if: steps.cache.outputs.cache-hit != 'true'
       run: |
         make coupledL2-compile
+        make openLLC-compile
 
     - name: Build verilog
       if: steps.cache.outputs.cache-hit != 'true'
       run: |
         make coupledL2-verilog-test-top-${{ matrix.case.id }}
+        make openLLC-verilog-test-top-${{ matrix.case.id }}
 
     - name: Tar up repository
       if: steps.cache.outputs.cache-hit != 'true'
@@ -235,14 +237,17 @@ jobs:
     - name: Verilate CoupledL2
       run: |
         make THREADS_BUILD=4 coupledL2-verilate
+        make THREADS_BUILD=4 openLLC-verilate
 
     - name: Configurate TL-Test-New for CoupledL2
       run: |
         make THREADS_BUILD=4 tltest-config-coupledL2-test-${{ matrix.case.id }}
+        make THREADS_BUILD=4 tltest-config-openLLC-test-${{ matrix.case.id }}
 
     - name: Build TL-Test-New for CoupledL2
       run: |
         make THREADS_BUILD=4 tltest-build-all-coupledL2
+        make THREADS_BUILD=4 tltest-build-all-openLLC
 
     - name: Tar up repository
       working-directory: ${{ github.workspace }}
@@ -299,6 +304,13 @@ jobs:
         ls
         sed -i 's/mode.0.*/mode.0 = FUZZ_ARI/g' ./configs/user.tltest.ini
         sed -i 's/mode.1.*/mode.1 = FUZZ_ARI/g' ./configs/user.tltest.ini
+        sed -i 's/mode.2.*/mode.2 = FUZZ_ARI/g' ./configs/user.tltest.ini
+        sed -i 's/mode.3.*/mode.3 = FUZZ_ARI/g' ./configs/user.tltest.ini
+        sed -i 's/mode.4.*/mode.4 = FUZZ_ARI/g' ./configs/user.tltest.ini
+        sed -i 's/mode.5.*/mode.5 = FUZZ_ARI/g' ./configs/user.tltest.ini
+        sed -i 's/cmo.enable .*=.*/cmo.enable = 1/g' ./configs/user.tltest.ini
+        sed -i 's/cmo.enable.cbo.clean.*=.*/cmo.enable.cbo.clean = 1/g' ./configs/user.tltest.ini
+        sed -i 's/cmo.enable.cbo.flush.*=.*/cmo.enable.cbo.flush = 1/g' ./configs/user.tltest.ini
         cat ./configs/user.tltest.ini
 
     - name: Setup mode configuration FUZZ_STREAM
@@ -308,6 +320,10 @@ jobs:
         ls
         sed -i 's/mode.0.*/mode.0 = FUZZ_STREAM/g' ./configs/user.tltest.ini
         sed -i 's/mode.1.*/mode.1 = FUZZ_STREAM/g' ./configs/user.tltest.ini
+        sed -i 's/mode.2.*/mode.2 = FUZZ_STREAM/g' ./configs/user.tltest.ini
+        sed -i 's/mode.3.*/mode.3 = FUZZ_STREAM/g' ./configs/user.tltest.ini
+        sed -i 's/mode.4.*/mode.4 = FUZZ_STREAM/g' ./configs/user.tltest.ini
+        sed -i 's/mode.5.*/mode.5 = FUZZ_STREAM/g' ./configs/user.tltest.ini
         cat ./configs/user.tltest.ini
 
     - name: Setup mode configuration BWPROF_STREAM_STRIDE_READ
@@ -317,6 +333,10 @@ jobs:
         ls
         sed -i 's/mode.0.*/mode.0 = BWPROF_STREAM_STRIDE_READ/g' ./configs/user.tltest.ini
         sed -i 's/mode.1.*/mode.1 = BWPROF_STREAM_STRIDE_READ/g' ./configs/user.tltest.ini
+        sed -i 's/mode.2.*/mode.2 = BWPROF_STREAM_STRIDE_READ/g' ./configs/user.tltest.ini
+        sed -i 's/mode.3.*/mode.3 = BWPROF_STREAM_STRIDE_READ/g' ./configs/user.tltest.ini
+        sed -i 's/mode.4.*/mode.4 = BWPROF_STREAM_STRIDE_READ/g' ./configs/user.tltest.ini
+        sed -i 's/mode.5.*/mode.5 = BWPROF_STREAM_STRIDE_READ/g' ./configs/user.tltest.ini
         cat ./configs/user.tltest.ini
 
     - name: Setup mode configuration UNIFIED_ANVIL
diff --git a/.github/workflows/scenario-OpenLLC.yml b/.github/workflows/scenario-OpenLLC.yml
deleted file mode 100644
index ae0692b..0000000
--- a/.github/workflows/scenario-OpenLLC.yml
+++ /dev/null
@@ -1,361 +0,0 @@
-name: scenario-OpenLLC
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-  workflow_dispatch:
-  schedule:
-  - cron: '0 0 * * 0'
-
-env:
-  CI_OS_NAME: linux
-  CI_COMMIT: ${{ github.sha }}
-  INSTALL_DIR: ${{ github.workspace }}/install
-
-defaults:
-  run:
-    shell: bash
-    working-directory: repo
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name == 'pull_reqeust' && github.ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-
-  prebuild-ootb-openLLC:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-22.04]
-        case:
-          - { id: l2l3,   name: L2-L3    }
-          - { id: l2l3l2, name: L2-L3-L2 }
-
-    runs-on: ${{ matrix.os }}
-    name: Pre-Build | ${{ matrix.case.name }} | OOTB OpenLLC
-    env:
-      OPENLLC_ARCHIVE: openLLC-${{ matrix.case.id }}-${{ github.sha }}.tar.gz
-
-    steps:
-    
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        path: repo
-
-    - name: Checkout OpenLLC
-      run: git submodule update --init dut/OpenLLC
-
-    - name: Extract submodule SHA
-      id: get_sha_OpenLLC
-      run: |
-        cd dut/OpenLLC
-        CURRENT_HASH=$(git rev-parse HEAD)
-        echo "${CURRENT_HASH}"
-        echo "CURRENT_HASH=${CURRENT_HASH}" >> $GITHUB_ENV
-        cd ../..
-
-    - name: Cache OpenLLC Build
-      id: cache
-      uses: actions/cache@v4
-      env:
-        cache-name: openLLC-cache-${{ env.CURRENT_HASH }}
-      with:
-        path: ${{ github.workspace }}/${{ env.OPENLLC_ARCHIVE }}
-        key: openLLC-cache-${{ env.CURRENT_HASH }}
-
-    - name: Checkout submodules
-      if: steps.cache.outputs.cache-hit != 'true'
-      run: git submodule update --init --recursive
-
-    - name: Setup Scala
-      if: steps.cache.outputs.cache-hit != 'true'
-      uses: olafurpg/setup-scala@v10
-
-    - name: Setup Mill
-      if: steps.cache.outputs.cache-hit != 'true'
-      run: |
-        sh -c "curl -L https://github.com/com-lihaoyi/mill/releases/download/0.11.1/0.11.1 > /usr/local/bin/mill && chmod +x /usr/local/bin/mill"
-
-    - name: Compile
-      if: steps.cache.outputs.cache-hit != 'true'
-      run: |
-        make openLLC-compile
-  
-    - name: Build verilog
-      if: steps.cache.outputs.cache-hit != 'true'
-      run: |
-        make openLLC-verilog-test-top-${{ matrix.case.id }}
-
-    - name: Tar up repository
-      if: steps.cache.outputs.cache-hit != 'true'
-      working-directory: ${{ github.workspace }}
-      run: tar -zcf ${{ env.OPENLLC_ARCHIVE }} repo/dut/OpenLLC/build
-
-  setup-verilator:
-    strategy:
-      matrix:
-        os: [ubuntu-22.04]
-        compiler:
-          - { cc: clang-16, cxx: clang++-16 }
-          - { cc: gcc,      cxx: g++        }
-    runs-on: ${{ matrix.os }}
-    name: Verilator | ${{ matrix.os }} | ${{ matrix.compiler.cc }}
-    env:
-      CI_BUILD_STAGE_NAME: build
-      CI_RUNS_ON: ${{ matrix.os }}
-      CC: ${{ matrix.compiler.cc }}
-      CXX: ${{ matrix.compiler.cxx }}
-      VERILATOR_ARCHIVE: verilator-${{ matrix.os }}-${{ matrix.compiler.cc }}.tar.gz
-    steps:
-
-    - name: Cache Verilator
-      id: cache
-      uses: actions/cache@v4
-      env:
-        cache-name: verilator-cache-${{ matrix.os }}-${{ matrix.compiler.cc }}
-      with:
-        path: ${{ github.workspace }}/${{ env.VERILATOR_ARCHIVE }}
-        key: verilator-cache-${{ matrix.os }}-${{ matrix.compiler.cc }}
-
-    - name: Setup Clang 16
-      if: steps.cache.outputs.cache-hit != 'true' && matrix.compiler.cc == 'clang-16'
-      working-directory: ${{ github.workspace }}
-      run: |
-        wget https://apt.llvm.org/llvm.sh
-        chmod u+x llvm.sh
-        sudo ./llvm.sh 16
-
-    - name: Build Verilator
-      if: steps.cache.outputs.cache-hit != 'true'
-      working-directory: ${{ github.workspace }}
-      run: |
-        sudo apt-get install -y git help2man perl python3 make autoconf g++ flex bison clang
-        sudo apt-get install -y libfl2  # Ubuntu only (ignore if gives error)
-        sudo apt-get install -y libfl-dev  # Ubuntu only (ignore if gives error)
-        sudo apt-get install -y zlib1g zlib1g-dev  # Ubuntu only (ignore if gives error)
-        git clone https://github.com/verilator/verilator
-        unset VERILATOR_ROOT
-        cd verilator
-        git checkout v5.020
-        autoconf
-        ./configure CC=${{ matrix.compiler.cc }} CXX=${{ matrix.compiler.cxx }} LINK=${{ matrix.compiler.cxx }}
-        make -j4
-
-    - name: Tar-up Verilator
-      if: steps.cache.outputs.cache-hit != 'true'
-      working-directory: ${{ github.workspace }}
-      run: tar -zcf ${{ env.VERILATOR_ARCHIVE }} verilator
-
-  build:
-    needs: 
-      - prebuild-ootb-openLLC
-      - setup-verilator
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-22.04]
-        case:
-          - { id: l2l3,   name: L2-L3    }
-          - { id: l2l3l2, name: L2-L3-L2 }
-        compiler:
-          - { cc: clang-16, cxx: clang++-16 }
-          - { cc: gcc,      cxx: g++        }
-    runs-on: ${{ matrix.os }}
-    name: Build | ${{ matrix.case.name }} | ${{ matrix.os }} | ${{ matrix.compiler.cc }}
-    env:
-      CI_BUILD_STAGE_NAME: build
-      CI_RUNS_ON: ${{ matrix.os }}
-      CC: ${{ matrix.compiler.cc }}
-      CXX: ${{ matrix.compiler.cxx }}
-      OPENLLC_ARCHIVE: openLLC-${{ matrix.case.id }}-${{ github.sha }}.tar.gz
-      TLTEST_ARCHIVE: tl-test-new-${{ matrix.case.id }}-${{ github.sha }}-${{ matrix.os }}-${{ matrix.compiler.cc }}.tar.gz
-      VERILATOR_ARCHIVE: verilator-${{ matrix.os }}-${{ matrix.compiler.cc }}.tar.gz
-    steps:
-
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        path: repo
-
-    - name: Checkout OpenLLC
-      run: git submodule update --init dut/OpenLLC
-
-    - name: Setup Clang 16
-      if: matrix.compiler.cc == 'clang-16'
-      working-directory: ${{ github.workspace }}
-      run: |
-        wget https://apt.llvm.org/llvm.sh
-        chmod u+x llvm.sh
-        sudo ./llvm.sh 16
-
-    - name: Fetch cached Verilator
-      uses: actions/cache/restore@v4
-      env:
-        cache-name: verilator-cache-${{ matrix.os }}-${{ matrix.compiler.cc }}
-      with:
-        path: ${{ github.workspace }}/${{ env.VERILATOR_ARCHIVE }}
-        key: verilator-cache-${{ matrix.os }}-${{ matrix.compiler.cc }}
-        fail-on-cache-miss: true
-
-    - name: Install Verilator
-      working-directory: ${{ github.workspace }}
-      run: |
-        tar -zxf ${{ env.VERILATOR_ARCHIVE }}
-        cd verilator
-        sudo make install
-        verilator --version
-
-    - name: Extract submodule SHA
-      id: get_sha_OpenLLC
-      working-directory: ${{ github.workspace }}
-      run: |
-        cd repo/dut/OpenLLC
-        CURRENT_HASH=$(git rev-parse HEAD)
-        echo "${CURRENT_HASH}"
-        echo "CURRENT_HASH=${CURRENT_HASH}" >> $GITHUB_ENV
-
-    - name: Fetch cached OpenLLC
-      id: cache
-      uses: actions/cache/restore@v4
-      env:
-        cache-name: openLLC-cache-${{ env.CURRENT_HASH }}
-      with:
-        path: ${{ github.workspace }}/${{ env.OPENLLC_ARCHIVE }}
-        key: openLLC-cache-${{ env.CURRENT_HASH }}
-        fail-on-cache-miss: true
-
-    - name: Unpack OpenLLC artifact
-      working-directory: ${{ github.workspace }}
-      run: tar -zxf ${{ env.OPENLLC_ARCHIVE }}
-
-    - name: Verilate OpenLLC
-      run: |
-        make THREADS_BUILD=4 openLLC-verilate
-
-    - name: Configurate TL-Test-New for OpenLLC
-      run: |
-        make THREADS_BUILD=4 tltest-config-openLLC-test-${{ matrix.case.id }}
-
-    - name: Build TL-Test-New for OpenLLC
-      run: |
-        make THREADS_BUILD=4 tltest-build-all-openLLC
-
-    - name: Tar up repository
-      working-directory: ${{ github.workspace }}
-      run: tar -zcf ${{ env.TLTEST_ARCHIVE }} repo/main/build repo/configs repo/scripts repo/Makefile
-
-    - name: Upload artifact
-      uses: actions/upload-artifact@v4
-      with:
-        path: ${{ github.workspace }}/${{ env.TLTEST_ARCHIVE }}
-        name: ${{ env.TLTEST_ARCHIVE }}
-
-  run:
-    needs: build
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-22.04]
-        case:
-          - { id: l2l3,   name: L2-L3   , mode: FUZZ_ARI }
-          - { id: l2l3l2, name: L2-L3-L2, mode: FUZZ_ARI }
-          - { id: l2l3,   name: L2-L3   , mode: FUZZ_STREAM }
-          - { id: l2l3l2, name: L2-L3-L2, mode: FUZZ_STREAM }
-          - { id: l2l3,   name: L2-L3   , mode: BWPROF_STREAM_STRIDE_READ }
-          - { id: l2l3l2, name: L2-L3-L2, mode: BWPROF_STREAM_STRIDE_READ }
-          - { id: l2l3l2, name: L2-L3-L2, mode: UNIFIED_ANVIL }
-        compiler:
-          - { cc: clang-16, cxx: clang++-16 }
-          - { cc: gcc,      cxx: g++        }
-    runs-on: ${{ matrix.os }}
-    name: Run | ${{ matrix.case.name }} | ${{ matrix.case.mode }} | ${{ matrix.os }} | ${{ matrix.compiler.cc }}
-    env:
-      CI_BUILD_STAGE_NAME: build
-      CI_RUNS_ON: ${{ matrix.os }}
-      CC: ${{ matrix.compiler.cc }}
-      CXX: ${{ matrix.compiler.cxx }}
-      TLTEST_ARCHIVE: tl-test-new-${{ matrix.case.id }}-${{ github.sha }}-${{ matrix.os }}-${{ matrix.compiler.cc }}.tar.gz
-      RUN_ARCHIVE: tl-test-new-run-${{ matrix.case.id }}-${{ github.sha }}-${{ matrix.os }}-${{ matrix.compiler.cc }}.tar.gz
-    steps:
-
-    - name: Download artifact
-      uses: actions/download-artifact@v4
-      with:
-        name: ${{ env.TLTEST_ARCHIVE }}
-        path: ${{ github.workspace }}
-
-    - name: Unpack artifact
-      working-directory: ${{ github.workspace }}
-      run: tar -zxvf ${{ env.TLTEST_ARCHIVE }}
-
-    - name: Setup mode configuration FUZZ_ARI with CMO
-      if: matrix.case.mode == 'FUZZ_ARI'
-      run: |
-        pwd
-        ls
-        sed -i 's/mode.0.*/mode.0 = FUZZ_ARI/g' ./configs/user.tltest.ini
-        sed -i 's/mode.1.*/mode.1 = FUZZ_ARI/g' ./configs/user.tltest.ini
-        sed -i 's/mode.2.*/mode.2 = FUZZ_ARI/g' ./configs/user.tltest.ini
-        sed -i 's/mode.3.*/mode.3 = FUZZ_ARI/g' ./configs/user.tltest.ini
-        sed -i 's/mode.4.*/mode.4 = FUZZ_ARI/g' ./configs/user.tltest.ini
-        sed -i 's/mode.5.*/mode.5 = FUZZ_ARI/g' ./configs/user.tltest.ini
-        sed -i 's/cmo.enable .*=.*/cmo.enable = 1/g' ./configs/user.tltest.ini
-        sed -i 's/cmo.enable.cbo.clean.*=.*/cmo.enable.cbo.clean = 1/g' ./configs/user.tltest.ini
-        sed -i 's/cmo.enable.cbo.flush.*=.*/cmo.enable.cbo.flush = 1/g' ./configs/user.tltest.ini
-        cat ./configs/user.tltest.ini
-
-    - name: Setup mode configuration FUZZ_STREAM
-      if: matrix.case.mode == 'FUZZ_STREAM'
-      run: |
-        pwd
-        ls
-        sed -i 's/mode.0.*/mode.0 = FUZZ_STREAM/g' ./configs/user.tltest.ini
-        sed -i 's/mode.1.*/mode.1 = FUZZ_STREAM/g' ./configs/user.tltest.ini
-        sed -i 's/mode.2.*/mode.2 = FUZZ_STREAM/g' ./configs/user.tltest.ini
-        sed -i 's/mode.3.*/mode.3 = FUZZ_STREAM/g' ./configs/user.tltest.ini
-        sed -i 's/mode.4.*/mode.4 = FUZZ_STREAM/g' ./configs/user.tltest.ini
-        sed -i 's/mode.5.*/mode.5 = FUZZ_STREAM/g' ./configs/user.tltest.ini
-        cat ./configs/user.tltest.ini
-
-    - name: Setup mode configuration BWPROF_STREAM_STRIDE_READ
-      if: matrix.case.mode == 'BWPROF_STREAM_STRIDE_READ'
-      run: |
-        pwd
-        ls
-        sed -i 's/mode.0.*/mode.0 = BWPROF_STREAM_STRIDE_READ/g' ./configs/user.tltest.ini
-        sed -i 's/mode.1.*/mode.1 = BWPROF_STREAM_STRIDE_READ/g' ./configs/user.tltest.ini
-        sed -i 's/mode.2.*/mode.2 = BWPROF_STREAM_STRIDE_READ/g' ./configs/user.tltest.ini
-        sed -i 's/mode.3.*/mode.3 = BWPROF_STREAM_STRIDE_READ/g' ./configs/user.tltest.ini
-        sed -i 's/mode.4.*/mode.4 = BWPROF_STREAM_STRIDE_READ/g' ./configs/user.tltest.ini
-        sed -i 's/mode.5.*/mode.5 = BWPROF_STREAM_STRIDE_READ/g' ./configs/user.tltest.ini
-        cat ./configs/user.tltest.ini
-
-    - name: Setup mode configuration UNIFIED_ANVIL
-      if: matrix.case.mode == 'UNIFIED_ANVIL'
-      run: |
-        pwd
-        ls
-        sed -i 's/unified.enable.*/unified.enable = 1/g' ./configs/user.tltest.ini
-        sed -i 's/unified.mode.*/unified.mode = ANVIL/g' ./configs/user.tltest.ini
-        sed -i 's/unified.anvil.size.*/unified.anvil.size = 256/g' ./configs/user.tltest.ini
-        sed -i 's/unified.anvil.epoch.*/unified.anvil.epoch = 64/g' ./configs/user.tltest.ini
-        sed -i 's/unified.anvil.width.b.*/unified.anvil.width.b = 1/g' ./configs/user.tltest.ini
-        cat ./configs/user.tltest.ini
-
-    - name: Run TL-Test-New for OpenLLC
-      run: |
-        make run
-
-#   - name: Tar up repository
-#     working-directory: ${{ github.workspace }}
-#     run: tar -zcf ${{ env.RUN_ARCHIVE }} repo
-
-#   - name: Upload artifact
-#     uses: actions/upload-artifact@v4
-#     with:
-#       path: ${{ github.workspace }}/${{ env.RUN_ARCHIVE }}
-#       name: ${{ env.RUN_ARCHIVE }}
diff --git a/.gitmodules b/.gitmodules
index a559c39..be78790 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "dut/CoupledL2"]
 	path = dut/CoupledL2
 	url = https://github.com/OpenXiangShan/CoupledL2.git
-[submodule "dut/OpenLLC"]
-	path = dut/OpenLLC
-	url = https://github.com/OpenXiangShan/OpenLLC.git
diff --git a/Makefile b/Makefile
index 6b059b2..2ff23f3 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,6 @@ endif
 init:
 	git submodule update --init --recursive
 	$(MAKE) -C ./dut/CoupledL2 init
-	$(MAKE) -C ./dut/OpenLLC init
 
 FORCE:
 
@@ -39,15 +38,15 @@ tltest-prepare-v3-coupledL2:
 
 tltest-prepare-all-openLLC:
 	cmake ./main -B ./main/build -DBUILD_DPI=ON -DBUILD_V3=ON $(CMAKE_CXX_COMPILER) \
-		-DDUT_PATH="${PWD}/dut/OpenLLC"
+		-DDUT_PATH="${PWD}/dut/CoupledL2"
 
 tltest-prepare-dpi-openLLC:
 	cmake ./main -B ./main/build -DBUILD_DPI=ON -DBUILD_V3=OFF $(CMAKE_CXX_COMPILER) \
-		-DDUT_PATH="${PWD}/dut/OpenLLC"
+		-DDUT_PATH="${PWD}/dut/CoupledL2"
 
 tltest-prepare-v3-openLLC:
 	cmake ./main -B ./main/build -DBUILD_V3=ON -DBUILD_DPI=OFF $(CMAKE_CXX_COMPILER) \
-		-DDUT_PATH="${PWD}/dut/OpenLLC"
+		-DDUT_PATH="${PWD}/dut/CoupledL2"
 
 
 tltest-portgen:
@@ -107,32 +106,32 @@ tltest-build-v3-openLLC: tltest-prepare-v3-openLLC tltest-build
 
 
 coupledL2-compile:
-	$(MAKE) -C ./dut/CoupledL2 compile
+	$(MAKE) -C ./dut/CoupledL2 compile-coupledl2
 
 coupledL2-verilog-test-top-l2l3:
-	$(MAKE) -C ./dut/CoupledL2 test-top-l2l3
+	$(MAKE) -C ./dut/CoupledL2 test-top-l2l3-huancun
 
 coupledL2-verilog-test-top-l2l3l2:
-	$(MAKE) -C ./dut/CoupledL2 test-top-l2l3l2
+	$(MAKE) -C ./dut/CoupledL2 test-top-l2l3l2-huancun
 
 coupledL2-verilog-clean:
 	$(MAKE) -C ./dut/CoupledL2 clean
 
 openLLC-compile:
-	$(MAKE) -C ./dut/OpenLLC compile
+	$(MAKE) -C ./dut/CoupledL2 compile-openllc
 
 openLLC-verilog-test-top-l2l3:
-	$(MAKE) -C ./dut/OpenLLC test-top-l2l3
+	$(MAKE) -C ./dut/CoupledL2 test-top-l2l3-openllc
 
 openLLC-verilog-test-top-l2l3l2:
-	$(MAKE) -C ./dut/OpenLLC test-top-l2l3l2
+	$(MAKE) -C ./dut/CoupledL2 test-top-l2l3l2-openllc
 
 openLLC-verilog-clean:
-	$(MAKE) -C ./dut/OpenLLC clean
+	$(MAKE) -C ./dut/CoupledL2 clean
 
 
 VERILATOR := verilator
-VERILATOR_COMMON_ARGS_COUPLEDL2 := ./dut/CoupledL2/build/*.*v \
+VERILATOR_COMMON_ARGS_COUPLEDL2 := ./dut/CoupledL2/build/coupledl2/*.*v \
 		--Mdir ./verilated \
 		-O3 \
 		--trace-fst \
@@ -140,7 +139,7 @@ VERILATOR_COMMON_ARGS_COUPLEDL2 := ./dut/CoupledL2/build/*.*v \
 		--build-jobs $(THREADS_BUILD) --verilate-jobs $(THREADS_BUILD) \
 		-DSIM_TOP_MODULE_NAME=TestTop \
 		-Wno-fatal
-VERILATOR_COMMON_ARGS_OPENLLC := ./dut/OpenLLC/build/*.*v \
+VERILATOR_COMMON_ARGS_OPENLLC := ./dut/CoupledL2/build/openllc/*.*v \
 		--Mdir ./verilated \
 		-O3 \
 		--trace-fst \
@@ -162,7 +161,7 @@ coupledL2-verilate-build:
 coupledL2-verilate:
 	rm -rf verilated
 	mkdir verilated
-	verilator --trace-fst --cc --build --lib-create vltdut --Mdir ./verilated ./dut/CoupledL2/build/*.*v -Wno-fatal \
+	verilator --trace-fst --cc --build --lib-create vltdut --Mdir ./verilated ./dut/CoupledL2/build/coupledl2/*.*v -Wno-fatal \
 		--top TestTop --build-jobs $(THREADS_BUILD) --verilate-jobs $(THREADS_BUILD) -DSIM_TOP_MODULE_NAME=TestTop
 
 coupledL2-verilate-clean:
@@ -181,7 +180,7 @@ openLLC-verilate-build:
 openLLC-verilate:
 	rm -rf verilated
 	mkdir verilated
-	verilator --trace-fst --cc --build --lib-create vltdut --Mdir ./verilated ./dut/OpenLLC/build/*.*v -Wno-fatal \
+	verilator --trace-fst --cc --build --lib-create vltdut --Mdir ./verilated ./dut/CoupledL2/build/openllc/*.*v -Wno-fatal \
 		--top TestTop --build-jobs $(THREADS_BUILD) --verilate-jobs $(THREADS_BUILD) -DSIM_TOP_MODULE_NAME=TestTop
 
 openLLC-verilate-clean:
diff --git a/dut/CoupledL2 b/dut/CoupledL2
index 800bb00..61376ef 160000
--- a/dut/CoupledL2
+++ b/dut/CoupledL2
@@ -1 +1 @@
-Subproject commit 800bb00c894bae89951412cec02d02ea49d7f90f
+Subproject commit 61376ef968fe8b52e2e1aadcfa9f5448e4306d8e
diff --git a/dut/OpenLLC b/dut/OpenLLC
deleted file mode 160000
index 484d1ac..0000000
--- a/dut/OpenLLC
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 484d1ac6f796c320d3414222819721bba0c02d8c