diff --git a/substreams/ethereum-balancer/proto/balancer.proto b/proto/tycho/evm/v1/balancer.proto
similarity index 84%
rename from substreams/ethereum-balancer/proto/balancer.proto
rename to proto/tycho/evm/v1/balancer.proto
index 6efe1c9..f5a4c63 100644
--- a/substreams/ethereum-balancer/proto/balancer.proto
+++ b/proto/tycho/evm/v1/balancer.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package balancer;
+package tycho.evm.v1;
 
 import "tycho/evm/v1/common.proto";
 
@@ -8,7 +8,7 @@ import "tycho/evm/v1/common.proto";
 message BalanceDelta {
   uint64 ord = 1;
   // The tx hash of the transaction that caused the balance change.
-  tycho.evm.v1.Transaction tx = 2;
+  Transaction tx = 2;
   // The address of the ERC20 token whose balance changed.
   bytes token = 3;
   // The delta balance of the token.
@@ -23,8 +23,8 @@ message BalanceDeltas {
 }
 
 message TransactionProtocolComponents {
-  tycho.evm.v1.Transaction tx = 1;
-  repeated tycho.evm.v1.ProtocolComponent components = 2;
+  Transaction tx = 1;
+  repeated ProtocolComponent components = 2;
 }
 
 message GroupedTransactionProtocolComponents {
diff --git a/substreams/ethereum-balancer/src/modules.rs b/substreams/ethereum-balancer/src/modules.rs
index 2b47bd1..75f61a3 100644
--- a/substreams/ethereum-balancer/src/modules.rs
+++ b/substreams/ethereum-balancer/src/modules.rs
@@ -14,16 +14,14 @@ use substreams::scalar::BigInt;
 use substreams_ethereum::pb::eth;
 
 use itertools::Itertools;
-use pb::tycho::evm::v1::{self as tycho};
+
 
 use contract_changes::extract_contract_changes;
 use substreams_ethereum::Event;
 
-use crate::pb::balancer::{
-    BalanceDelta, BalanceDeltas, GroupedTransactionProtocolComponents,
-    TransactionProtocolComponents,
-};
-use crate::{abi, contract_changes, pb, pool_factories};
+use crate::pb::tycho::evm::v1::{self as tycho};
+use crate::pb::tycho::evm::v1::{BalanceDelta, BalanceDeltas, GroupedTransactionProtocolComponents, TransactionProtocolComponents};
+use crate::{abi, contract_changes, pool_factories};
 
 const VAULT_ADDRESS: &[u8] = &hex!("BA12222222228d8Ba445958a75a0704d566BF2C8");
 
diff --git a/substreams/ethereum-balancer/src/pb/balancer.rs b/substreams/ethereum-balancer/src/pb/balancer.rs
deleted file mode 100644
index b2f52d2..0000000
--- a/substreams/ethereum-balancer/src/pb/balancer.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-// @generated
-/// A struct for following the changes of Total Value Locked (TVL).
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct BalanceDelta {
-    #[prost(uint64, tag="1")]
-    pub ord: u64,
-    /// The tx hash of the transaction that caused the balance change.
-    #[prost(message, optional, tag="2")]
-    pub tx: ::core::option::Option<super::tycho::evm::v1::Transaction>,
-    /// The address of the ERC20 token whose balance changed.
-    #[prost(bytes="vec", tag="3")]
-    pub token: ::prost::alloc::vec::Vec<u8>,
-    /// The delta balance of the token.
-    #[prost(bytes="vec", tag="4")]
-    pub delta: ::prost::alloc::vec::Vec<u8>,
-    /// The id of the component whose TVL is tracked.
-    /// If the protocol component includes multiple contracts, the balance change must be aggregated to reflect how much tokens can be traded.
-    #[prost(bytes="vec", tag="5")]
-    pub component_id: ::prost::alloc::vec::Vec<u8>,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct BalanceDeltas {
-    #[prost(message, repeated, tag="1")]
-    pub balance_deltas: ::prost::alloc::vec::Vec<BalanceDelta>,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct TransactionProtocolComponents {
-    #[prost(message, optional, tag="1")]
-    pub tx: ::core::option::Option<super::tycho::evm::v1::Transaction>,
-    #[prost(message, repeated, tag="2")]
-    pub components: ::prost::alloc::vec::Vec<super::tycho::evm::v1::ProtocolComponent>,
-}
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct GroupedTransactionProtocolComponents {
-    #[prost(message, repeated, tag="1")]
-    pub tx_components: ::prost::alloc::vec::Vec<TransactionProtocolComponents>,
-}
-// @@protoc_insertion_point(module)
diff --git a/substreams/ethereum-balancer/src/pb/mod.rs b/substreams/ethereum-balancer/src/pb/mod.rs
index 1d5f1e8..43d8838 100644
--- a/substreams/ethereum-balancer/src/pb/mod.rs
+++ b/substreams/ethereum-balancer/src/pb/mod.rs
@@ -1,9 +1,4 @@
 // @generated
-// @@protoc_insertion_point(attribute:balancer)
-pub mod balancer {
-    include!("balancer.rs");
-    // @@protoc_insertion_point(balancer)
-}
 pub mod tycho {
     pub mod evm {
         // @@protoc_insertion_point(attribute:tycho.evm.v1)
diff --git a/substreams/ethereum-balancer/src/pb/tycho.evm.v1.rs b/substreams/ethereum-balancer/src/pb/tycho.evm.v1.rs
index cf81ed2..21d371d 100644
--- a/substreams/ethereum-balancer/src/pb/tycho.evm.v1.rs
+++ b/substreams/ethereum-balancer/src/pb/tycho.evm.v1.rs
@@ -267,4 +267,44 @@ pub struct BlockContractChanges {
     #[prost(message, repeated, tag="2")]
     pub changes: ::prost::alloc::vec::Vec<TransactionContractChanges>,
 }
+/// A struct for following the changes of Total Value Locked (TVL).
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct BalanceDelta {
+    #[prost(uint64, tag="1")]
+    pub ord: u64,
+    /// The tx hash of the transaction that caused the balance change.
+    #[prost(message, optional, tag="2")]
+    pub tx: ::core::option::Option<Transaction>,
+    /// The address of the ERC20 token whose balance changed.
+    #[prost(bytes="vec", tag="3")]
+    pub token: ::prost::alloc::vec::Vec<u8>,
+    /// The delta balance of the token.
+    #[prost(bytes="vec", tag="4")]
+    pub delta: ::prost::alloc::vec::Vec<u8>,
+    /// The id of the component whose TVL is tracked.
+    /// If the protocol component includes multiple contracts, the balance change must be aggregated to reflect how much tokens can be traded.
+    #[prost(bytes="vec", tag="5")]
+    pub component_id: ::prost::alloc::vec::Vec<u8>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct BalanceDeltas {
+    #[prost(message, repeated, tag="1")]
+    pub balance_deltas: ::prost::alloc::vec::Vec<BalanceDelta>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct TransactionProtocolComponents {
+    #[prost(message, optional, tag="1")]
+    pub tx: ::core::option::Option<Transaction>,
+    #[prost(message, repeated, tag="2")]
+    pub components: ::prost::alloc::vec::Vec<ProtocolComponent>,
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct GroupedTransactionProtocolComponents {
+    #[prost(message, repeated, tag="1")]
+    pub tx_components: ::prost::alloc::vec::Vec<TransactionProtocolComponents>,
+}
 // @@protoc_insertion_point(module)
diff --git a/substreams/ethereum-balancer/substreams.yaml b/substreams/ethereum-balancer/substreams.yaml
index c5b56d0..9919f23 100644
--- a/substreams/ethereum-balancer/substreams.yaml
+++ b/substreams/ethereum-balancer/substreams.yaml
@@ -7,10 +7,9 @@ protobuf:
   files:
     - tycho/evm/v1/vm.proto
     - tycho/evm/v1/common.proto
-    - balancer.proto
+    - tycho/evm/v1/balancer.proto
   importPaths:
     - ../../proto
-    - ./proto
 
 binaries:
   default: