diff --git a/src_common/ethUstream.c b/src/ethUstream.c
similarity index 100%
rename from src_common/ethUstream.c
rename to src/ethUstream.c
diff --git a/src_common/ethUstream.h b/src/ethUstream.h
similarity index 100%
rename from src_common/ethUstream.h
rename to src/ethUstream.h
diff --git a/src_common/ethUtils.c b/src/ethUtils.c
similarity index 100%
rename from src_common/ethUtils.c
rename to src/ethUtils.c
diff --git a/src_common/ethUtils.h b/src/ethUtils.h
similarity index 100%
rename from src_common/ethUtils.h
rename to src/ethUtils.h
diff --git a/src_common/hash_bytes.c b/src/hash_bytes.c
similarity index 100%
rename from src_common/hash_bytes.c
rename to src/hash_bytes.c
diff --git a/src_common/hash_bytes.h b/src/hash_bytes.h
similarity index 100%
rename from src_common/hash_bytes.h
rename to src/hash_bytes.h
diff --git a/src_common/mem.c b/src/mem.c
similarity index 100%
rename from src_common/mem.c
rename to src/mem.c
diff --git a/src_common/mem.h b/src/mem.h
similarity index 100%
rename from src_common/mem.h
rename to src/mem.h
diff --git a/src_common/mem_utils.c b/src/mem_utils.c
similarity index 100%
rename from src_common/mem_utils.c
rename to src/mem_utils.c
diff --git a/src_common/mem_utils.h b/src/mem_utils.h
similarity index 100%
rename from src_common/mem_utils.h
rename to src/mem_utils.h
diff --git a/src_common/network.c b/src/network.c
similarity index 100%
rename from src_common/network.c
rename to src/network.c
diff --git a/src_common/network.h b/src/network.h
similarity index 100%
rename from src_common/network.h
rename to src/network.h
diff --git a/src_common/plugins.c b/src/plugins.c
similarity index 100%
rename from src_common/plugins.c
rename to src/plugins.c
diff --git a/src_common/plugins.h b/src/plugins.h
similarity index 100%
rename from src_common/plugins.h
rename to src/plugins.h
diff --git a/src_common/starkDisplayUtils.c b/src/starkDisplayUtils.c
similarity index 100%
rename from src_common/starkDisplayUtils.c
rename to src/starkDisplayUtils.c
diff --git a/src_common/starkDisplayUtils.h b/src/starkDisplayUtils.h
similarity index 100%
rename from src_common/starkDisplayUtils.h
rename to src/starkDisplayUtils.h
diff --git a/src_common/uint128.c b/src/uint128.c
similarity index 100%
rename from src_common/uint128.c
rename to src/uint128.c
diff --git a/src_common/uint128.h b/src/uint128.h
similarity index 100%
rename from src_common/uint128.h
rename to src/uint128.h
diff --git a/src_common/uint256.c b/src/uint256.c
similarity index 100%
rename from src_common/uint256.c
rename to src/uint256.c
diff --git a/src_common/uint256.h b/src/uint256.h
similarity index 100%
rename from src_common/uint256.h
rename to src/uint256.h
diff --git a/src_common/uint_common.c b/src/uint_common.c
similarity index 100%
rename from src_common/uint_common.c
rename to src/uint_common.c
diff --git a/src_common/uint_common.h b/src/uint_common.h
similarity index 100%
rename from src_common/uint_common.h
rename to src/uint_common.h
diff --git a/tools/build_sdk.py b/tools/build_sdk.py
index a276324..7ca0f91 100755
--- a/tools/build_sdk.py
+++ b/tools/build_sdk.py
@@ -157,8 +157,8 @@ if __name__ == "__main__":
         "src/tokens.h",
         "src/chainConfig.h",
         "src/utils.h",
-        "src_common/ethUstream.h",
-        "src_common/ethUtils.h",
+        "src/ethUstream.h",
+        "src/ethUtils.h",
         "src/shared_context.h",
         "src/eth_plugin_internal.h",
         "src/nft.h",
@@ -203,7 +203,7 @@ if __name__ == "__main__":
     # extract and merge function bodies
     c_files_to_merge = [
         "src/utils.c",
-        "src_common/ethUtils.c",
+        "src/ethUtils.c",
         "src/eth_plugin_internal.c",
     ]
     merge_c_files(c_files_to_merge, nodes_to_extract["fn"])