diff --git a/evmcc/bytecode/if1.evm b/evmcc/bytecode/if1.evm
deleted file mode 100644
index ee90092945..0000000000
--- a/evmcc/bytecode/if1.evm
+++ /dev/null
@@ -1 +0,0 @@
-600160805460006080530b6016596003608054601b586002608054
diff --git a/evmcc/lll/if1.asm b/evmcc/lll/if1.asm
deleted file mode 100644
index 4a938adcec..0000000000
--- a/evmcc/lll/if1.asm
+++ /dev/null
@@ -1,21 +0,0 @@
-.code:
-  PUSH 1
-  PUSH 128
-  MSTORE
-  PUSH 0
-  PUSH 128
-  MLOAD
-  GT
-  PUSH [tag0]
-  JUMPI
-  PUSH 3
-  PUSH 128
-  MSTORE
-  PUSH [tag1]
-  JUMP
-tag0: 
-  PUSH 2
-  PUSH 128
-  MSTORE
-tag1: 
-
diff --git a/evmcc/lll/if1.lll b/evmcc/lll/if1.lll
deleted file mode 100644
index 7984807c1f..0000000000
--- a/evmcc/lll/if1.lll
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  [i] 1
-
-  ( if (> @i 0) [i] 2 [i] 3 )
-}
diff --git a/evmcc/bytecode/arithmetic_test.evm b/evmcc/test/arith/arith1.evm
similarity index 100%
rename from evmcc/bytecode/arithmetic_test.evm
rename to evmcc/test/arith/arith1.evm
diff --git a/evmcc/lll/arithmetic_test.lll b/evmcc/test/arith/arith1.lll
similarity index 100%
rename from evmcc/lll/arithmetic_test.lll
rename to evmcc/test/arith/arith1.lll
diff --git a/evmcc/bytecode/fib1.evm b/evmcc/test/arith/fib1.evm
similarity index 100%
rename from evmcc/bytecode/fib1.evm
rename to evmcc/test/arith/fib1.evm
diff --git a/evmcc/lll/fib1.lll b/evmcc/test/arith/fib1.lll
similarity index 100%
rename from evmcc/lll/fib1.lll
rename to evmcc/test/arith/fib1.lll
diff --git a/evmcc/bytecode/ext_test.evm b/evmcc/test/ext/ext_test.evm
similarity index 100%
rename from evmcc/bytecode/ext_test.evm
rename to evmcc/test/ext/ext_test.evm
diff --git a/evmcc/lll/ext_test.lll b/evmcc/test/ext/ext_test.lll
similarity index 100%
rename from evmcc/lll/ext_test.lll
rename to evmcc/test/ext/ext_test.lll
diff --git a/evmcc/bytecode/store_test.evm b/evmcc/test/ext/store_test.evm
similarity index 100%
rename from evmcc/bytecode/store_test.evm
rename to evmcc/test/ext/store_test.evm
diff --git a/evmcc/lll/store_test.lll b/evmcc/test/ext/store_test.lll
similarity index 100%
rename from evmcc/lll/store_test.lll
rename to evmcc/test/ext/store_test.lll
diff --git a/evmcc/bytecode/for1.evm b/evmcc/test/jump/for1.evm
similarity index 100%
rename from evmcc/bytecode/for1.evm
rename to evmcc/test/jump/for1.evm
diff --git a/evmcc/lll/for1.lll b/evmcc/test/jump/for1.lll
similarity index 100%
rename from evmcc/lll/for1.lll
rename to evmcc/test/jump/for1.lll
diff --git a/evmcc/bytecode/for2.evm b/evmcc/test/jump/for2.evm
similarity index 100%
rename from evmcc/bytecode/for2.evm
rename to evmcc/test/jump/for2.evm
diff --git a/evmcc/lll/for2.lll b/evmcc/test/jump/for2.lll
similarity index 100%
rename from evmcc/lll/for2.lll
rename to evmcc/test/jump/for2.lll
diff --git a/evmcc/lll/when1.asm b/evmcc/test/jump/when1.asm
similarity index 100%
rename from evmcc/lll/when1.asm
rename to evmcc/test/jump/when1.asm
diff --git a/evmcc/bytecode/when1.evm b/evmcc/test/jump/when1.evm
similarity index 100%
rename from evmcc/bytecode/when1.evm
rename to evmcc/test/jump/when1.evm
diff --git a/evmcc/lll/when1.lll b/evmcc/test/jump/when1.lll
similarity index 100%
rename from evmcc/lll/when1.lll
rename to evmcc/test/jump/when1.lll
diff --git a/evmcc/bytecode/kv.evm b/evmcc/test/kv.evm
similarity index 100%
rename from evmcc/bytecode/kv.evm
rename to evmcc/test/kv.evm
diff --git a/evmcc/lll/kv.lll b/evmcc/test/kv.lll
similarity index 100%
rename from evmcc/lll/kv.lll
rename to evmcc/test/kv.lll
diff --git a/evmcc/bytecode/byte.evm b/evmcc/test/mem/byte.evm
similarity index 100%
rename from evmcc/bytecode/byte.evm
rename to evmcc/test/mem/byte.evm
diff --git a/evmcc/lll/byte.lll b/evmcc/test/mem/byte.lll
similarity index 100%
rename from evmcc/lll/byte.lll
rename to evmcc/test/mem/byte.lll
diff --git a/evmcc/bytecode/mem2.evm b/evmcc/test/mem/mem2.evm
similarity index 100%
rename from evmcc/bytecode/mem2.evm
rename to evmcc/test/mem/mem2.evm
diff --git a/evmcc/lll/mem2.lll b/evmcc/test/mem/mem2.lll
similarity index 100%
rename from evmcc/lll/mem2.lll
rename to evmcc/test/mem/mem2.lll
diff --git a/evmcc/bytecode/memtest1.evm b/evmcc/test/mem/memtest1.evm
similarity index 100%
rename from evmcc/bytecode/memtest1.evm
rename to evmcc/test/mem/memtest1.evm
diff --git a/evmcc/lll/memtest1.lll b/evmcc/test/mem/memtest1.lll
similarity index 100%
rename from evmcc/lll/memtest1.lll
rename to evmcc/test/mem/memtest1.lll
diff --git a/evmcc/bytecode/return1.evm b/evmcc/test/ret/return1.evm
similarity index 100%
rename from evmcc/bytecode/return1.evm
rename to evmcc/test/ret/return1.evm
diff --git a/evmcc/lll/return1.lll b/evmcc/test/ret/return1.lll
similarity index 100%
rename from evmcc/lll/return1.lll
rename to evmcc/test/ret/return1.lll
diff --git a/evmcc/bytecode/return2.evm b/evmcc/test/ret/return2.evm
similarity index 100%
rename from evmcc/bytecode/return2.evm
rename to evmcc/test/ret/return2.evm
diff --git a/evmcc/lll/return2.lll b/evmcc/test/ret/return2.lll
similarity index 100%
rename from evmcc/lll/return2.lll
rename to evmcc/test/ret/return2.lll
diff --git a/evmcc/bytecode/return_test.evm b/evmcc/test/ret/return_test.evm
similarity index 100%
rename from evmcc/bytecode/return_test.evm
rename to evmcc/test/ret/return_test.evm
diff --git a/evmcc/lll/return_test.lll b/evmcc/test/ret/return_test.lll
similarity index 100%
rename from evmcc/lll/return_test.lll
rename to evmcc/test/ret/return_test.lll
diff --git a/evmcc/bytecode/push_test.evm b/evmcc/test/stack/push_test.evm
similarity index 100%
rename from evmcc/bytecode/push_test.evm
rename to evmcc/test/stack/push_test.evm
diff --git a/evmcc/lll/push_test.lll b/evmcc/test/stack/push_test.lll
similarity index 100%
rename from evmcc/lll/push_test.lll
rename to evmcc/test/stack/push_test.lll
diff --git a/evmcc/bytecode/stack_test.evm b/evmcc/test/stack/stack_test.evm
similarity index 100%
rename from evmcc/bytecode/stack_test.evm
rename to evmcc/test/stack/stack_test.evm
diff --git a/evmcc/lll/stack_test.lll b/evmcc/test/stack/stack_test.lll
similarity index 100%
rename from evmcc/lll/stack_test.lll
rename to evmcc/test/stack/stack_test.lll
diff --git a/evmcc/bytecode/stackjump.evm b/evmcc/test/stack/stackjump.evm
similarity index 100%
rename from evmcc/bytecode/stackjump.evm
rename to evmcc/test/stack/stackjump.evm
diff --git a/evmcc/lll/stackjump.lll b/evmcc/test/stack/stackjump.lll
similarity index 100%
rename from evmcc/lll/stackjump.lll
rename to evmcc/test/stack/stackjump.lll