diff --git a/src/test/java/net/consensys/linea/zktracer/corset/module/alu/add/AddTracerTest.java b/src/test/java/net/consensys/linea/zktracer/module/alu/add/AddTracerTest.java
similarity index 98%
rename from src/test/java/net/consensys/linea/zktracer/corset/module/alu/add/AddTracerTest.java
rename to src/test/java/net/consensys/linea/zktracer/module/alu/add/AddTracerTest.java
index dd4a384eb3..3744d0623f 100644
--- a/src/test/java/net/consensys/linea/zktracer/corset/module/alu/add/AddTracerTest.java
+++ b/src/test/java/net/consensys/linea/zktracer/module/alu/add/AddTracerTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package net.consensys.linea.zktracer.corset.module.alu.add;
+package net.consensys.linea.zktracer.module.alu.add;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/test/java/net/consensys/linea/zktracer/corset/module/alu/add/AdderTest.java b/src/test/java/net/consensys/linea/zktracer/module/alu/add/AdderTest.java
similarity index 97%
rename from src/test/java/net/consensys/linea/zktracer/corset/module/alu/add/AdderTest.java
rename to src/test/java/net/consensys/linea/zktracer/module/alu/add/AdderTest.java
index 3b28987e43..b0cae0758a 100644
--- a/src/test/java/net/consensys/linea/zktracer/corset/module/alu/add/AdderTest.java
+++ b/src/test/java/net/consensys/linea/zktracer/module/alu/add/AdderTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package net.consensys.linea.zktracer.corset.module.alu.add;
+package net.consensys.linea.zktracer.module.alu.add;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/net/consensys/linea/zktracer/corset/module/alu/ext/ExtTracerTest.java b/src/test/java/net/consensys/linea/zktracer/module/alu/ext/ExtTracerTest.java
similarity index 98%
rename from src/test/java/net/consensys/linea/zktracer/corset/module/alu/ext/ExtTracerTest.java
rename to src/test/java/net/consensys/linea/zktracer/module/alu/ext/ExtTracerTest.java
index b5009fd0e4..0f174d6dba 100644
--- a/src/test/java/net/consensys/linea/zktracer/corset/module/alu/ext/ExtTracerTest.java
+++ b/src/test/java/net/consensys/linea/zktracer/module/alu/ext/ExtTracerTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package net.consensys.linea.zktracer.corset.module.alu.ext;
+package net.consensys.linea.zktracer.module.alu.ext;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/test/java/net/consensys/linea/zktracer/corset/module/alu/mod/ModTracerTest.java b/src/test/java/net/consensys/linea/zktracer/module/alu/mod/ModTracerTest.java
similarity index 98%
rename from src/test/java/net/consensys/linea/zktracer/corset/module/alu/mod/ModTracerTest.java
rename to src/test/java/net/consensys/linea/zktracer/module/alu/mod/ModTracerTest.java
index 4c1a84a0f7..5da8d66b99 100644
--- a/src/test/java/net/consensys/linea/zktracer/corset/module/alu/mod/ModTracerTest.java
+++ b/src/test/java/net/consensys/linea/zktracer/module/alu/mod/ModTracerTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package net.consensys.linea.zktracer.corset.module.alu.mod;
+package net.consensys.linea.zktracer.module.alu.mod;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
diff --git a/src/test/java/net/consensys/linea/zktracer/corset/module/shf/ShfTracerTest.java b/src/test/java/net/consensys/linea/zktracer/module/shf/ShfTracerTest.java
similarity index 97%
rename from src/test/java/net/consensys/linea/zktracer/corset/module/shf/ShfTracerTest.java
rename to src/test/java/net/consensys/linea/zktracer/module/shf/ShfTracerTest.java
index ac0bcd7bc5..1d3609fa83 100644
--- a/src/test/java/net/consensys/linea/zktracer/corset/module/shf/ShfTracerTest.java
+++ b/src/test/java/net/consensys/linea/zktracer/module/shf/ShfTracerTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package net.consensys.linea.zktracer.corset.module.shf;
+package net.consensys.linea.zktracer.module.shf;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.Mockito.when;
@@ -28,7 +28,6 @@
 import net.consensys.linea.zktracer.ZkTraceBuilder;
 import net.consensys.linea.zktracer.ZkTracer;
 import net.consensys.linea.zktracer.corset.CorsetValidator;
-import net.consensys.linea.zktracer.module.shf.ShfTracer;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/net/consensys/linea/zktracer/corset/module/wcp/WcpTracerTest.java b/src/test/java/net/consensys/linea/zktracer/module/wcp/WcpTracerTest.java
similarity index 98%
rename from src/test/java/net/consensys/linea/zktracer/corset/module/wcp/WcpTracerTest.java
rename to src/test/java/net/consensys/linea/zktracer/module/wcp/WcpTracerTest.java
index 038bde857e..337c95daae 100644
--- a/src/test/java/net/consensys/linea/zktracer/corset/module/wcp/WcpTracerTest.java
+++ b/src/test/java/net/consensys/linea/zktracer/module/wcp/WcpTracerTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package net.consensys.linea.zktracer.corset.module.wcp;
+package net.consensys.linea.zktracer.module.wcp;
 
 import static net.consensys.linea.zktracer.OpCode.SGT;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;