diff --git a/src/erc-20-pool-factory.ts b/src/erc-20-pool-factory.ts
index c74fe2c..6a6e9dc 100644
--- a/src/erc-20-pool-factory.ts
+++ b/src/erc-20-pool-factory.ts
@@ -14,8 +14,8 @@ import {
 } from "./utils/constants"
 import { addressToBytes, wadToDecimal } from "./utils/convert"
 import { getTokenDecimals, getTokenName, getTokenSymbol, getTokenTotalSupply } from "./utils/token-erc20"
-import { getRatesAndFees } from "./utils/pool"
-import { loadOrCreateFactory } from "./utils/pool-factory"
+import { getRatesAndFees } from "./utils/pool/pool"
+import { loadOrCreateFactory } from "./utils/pool/pool-factory"
 
 export function handlePoolCreated(event: PoolCreatedEvent): void {
   const poolCreated = new PoolCreated(
diff --git a/src/erc-20-pool.ts b/src/erc-20-pool.ts
index d2ee345..f75bdc0 100644
--- a/src/erc-20-pool.ts
+++ b/src/erc-20-pool.ts
@@ -66,16 +66,16 @@ import {
 import { ZERO_BD, ONE_BI, TEN_BI } from "./utils/constants"
 import { addressToBytes, bigIntArrayToIntArray, wadToDecimal } from "./utils/convert"
 import { loadOrCreateAccount, updateAccountLends, updateAccountLoans, updateAccountPools, updateAccountKicks, updateAccountTakes, updateAccountSettles, updateAccountReserveAuctions } from "./utils/account"
-import { getBucketId, getBucketInfo, loadOrCreateBucket } from "./utils/bucket"
-import { getLendId, loadOrCreateLend } from "./utils/lend"
-import { getBorrowerInfo, getLoanId, loadOrCreateLoan } from "./utils/loan"
-import { getLiquidationAuctionId, getAuctionInfoERC20Pool, loadOrCreateLiquidationAuction, updateLiquidationAuction, getAuctionStatus, loadOrCreateBucketTake } from "./utils/liquidation"
-import { getBurnInfo, updatePool, addLiquidationToPool, addReserveAuctionToPool, getLenderInfo, getRatesAndFees, calculateLendRate } from "./utils/pool"
+import { getBucketId, getBucketInfo, loadOrCreateBucket } from "./utils/pool/bucket"
+import { getLendId, loadOrCreateLend } from "./utils/pool/lend"
+import { getBorrowerInfo, getLoanId, loadOrCreateLoan } from "./utils/pool/loan"
+import { getLiquidationAuctionId, getAuctionInfoERC20Pool, loadOrCreateLiquidationAuction, updateLiquidationAuction, getAuctionStatus, loadOrCreateBucketTake } from "./utils/pool/liquidation"
+import { getBurnInfo, updatePool, addLiquidationToPool, addReserveAuctionToPool, getLenderInfo, getRatesAndFees, calculateLendRate } from "./utils/pool/pool"
 import { lpbValueInQuote } from "./utils/common"
-import { loadOrCreateReserveAuction, reserveAuctionKickerReward } from "./utils/reserve-auction"
+import { loadOrCreateReserveAuction, reserveAuctionKickerReward } from "./utils/pool/reserve-auction"
 import { incrementTokenTxCount } from "./utils/token-erc20"
-import { approveTransferors, loadOrCreateTransferors, revokeTransferors } from "./utils/lp-transferors"
-import { loadOrCreateAllowances, increaseAllowances, decreaseAllowances, revokeAllowances } from "./utils/lp-allowances"
+import { approveTransferors, loadOrCreateTransferors, revokeTransferors } from "./utils/pool/lp-transferors"
+import { loadOrCreateAllowances, increaseAllowances, decreaseAllowances, revokeAllowances } from "./utils/pool/lp-allowances"
 
 export function handleAddCollateral(event: AddCollateralEvent): void {
   const addCollateral = new AddCollateral(
diff --git a/src/erc-721-pool-factory.ts b/src/erc-721-pool-factory.ts
index 4840c65..98897cf 100644
--- a/src/erc-721-pool-factory.ts
+++ b/src/erc-721-pool-factory.ts
@@ -1,7 +1,7 @@
 import { PoolCreated as PoolCreatedEvent } from "../generated/ERC721PoolFactory/ERC721PoolFactory"
 import { Pool, PoolCreated, Token } from "../generated/schema"
 import { ONE_BI } from "./utils/constants"
-import { loadOrCreateFactory } from "./utils/pool-factory"
+import { loadOrCreateFactory } from "./utils/pool/pool-factory"
 
 export function handlePoolCreated(event: PoolCreatedEvent): void {
   const poolCreated = new PoolCreated(
diff --git a/src/position-manager.ts b/src/position-manager.ts
index 1980eeb..8b63b1a 100644
--- a/src/position-manager.ts
+++ b/src/position-manager.ts
@@ -22,11 +22,11 @@ import {
   RedeemPosition,
   Transfer
 } from "../generated/schema"
-import { getBucketId } from "./utils/bucket"
+import { getBucketId } from "./utils/pool/bucket"
 import { lpbValueInQuote } from "./utils/common"
 import { ONE_BI, ZERO_BD } from "./utils/constants"
 import { addressToBytes, bigIntArrayToIntArray, wadToDecimal } from "./utils/convert"
-import { getLendId, loadOrCreateLend } from "./utils/lend"
+import { getLendId, loadOrCreateLend } from "./utils/pool/lend"
 import { deletePosition, getPoolForToken, loadOrCreateLPToken, loadOrCreatePosition } from "./utils/position"
 
 export function handleApproval(event: ApprovalEvent): void {
diff --git a/src/utils/bucket.ts b/src/utils/pool/bucket.ts
similarity index 89%
rename from src/utils/bucket.ts
rename to src/utils/pool/bucket.ts
index e0805cf..590db22 100644
--- a/src/utils/bucket.ts
+++ b/src/utils/pool/bucket.ts
@@ -1,10 +1,10 @@
 import { Address, BigDecimal, BigInt, Bytes, dataSource, log } from "@graphprotocol/graph-ts"
 
-import { Bucket } from "../../generated/schema"
-import { PoolInfoUtils } from '../../generated/templates/ERC20Pool/PoolInfoUtils'
+import { Bucket } from "../../../generated/schema"
+import { PoolInfoUtils } from '../../../generated/templates/ERC20Pool/PoolInfoUtils'
 
-import { poolInfoUtilsAddressTable, ONE_BD, ZERO_BD } from "./constants"
-import { indexToPrice, wadToDecimal } from "./convert"
+import { poolInfoUtilsAddressTable, ONE_BD, ZERO_BD } from "../constants"
+import { indexToPrice, wadToDecimal } from "../convert"
 
 export function getBucketId(pool: Bytes, index: u32): Bytes {
     return pool.concat(Bytes.fromUTF8('#' + index.toString()))
diff --git a/src/utils/lend.ts b/src/utils/pool/lend.ts
similarity index 88%
rename from src/utils/lend.ts
rename to src/utils/pool/lend.ts
index 579dc93..1ca19df 100644
--- a/src/utils/lend.ts
+++ b/src/utils/pool/lend.ts
@@ -1,7 +1,7 @@
 import { BigInt, Bytes } from "@graphprotocol/graph-ts"
-import { Lend } from "../../generated/schema"
+import { Lend } from "../../../generated/schema"
 
-import { ZERO_BD, ZERO_BI } from "./constants"
+import { ZERO_BD, ZERO_BI } from "../constants"
 
 
 export function getLendId(bucketId: Bytes, accountId: Bytes): Bytes {
diff --git a/src/utils/liquidation.ts b/src/utils/pool/liquidation.ts
similarity index 95%
rename from src/utils/liquidation.ts
rename to src/utils/pool/liquidation.ts
index c19a90e..443eb02 100644
--- a/src/utils/liquidation.ts
+++ b/src/utils/pool/liquidation.ts
@@ -1,11 +1,11 @@
 import { Address, BigDecimal, BigInt, Bytes, Value, dataSource } from "@graphprotocol/graph-ts"
 
-import { LiquidationAuction, Kick, Loan, Pool, BucketTake } from "../../generated/schema"
-import { ERC20Pool } from '../../generated/templates/ERC20Pool/ERC20Pool'
+import { LiquidationAuction, Kick, Loan, Pool, BucketTake } from "../../../generated/schema"
+import { ERC20Pool } from '../../../generated/templates/ERC20Pool/ERC20Pool'
 
-import { wadToDecimal } from "./convert"
-import { ONE_BI, ZERO_ADDRESS, ZERO_BD, ZERO_BI, poolInfoUtilsAddressTable } from "./constants"
-import { PoolInfoUtils } from "../../generated/templates/ERC20Pool/PoolInfoUtils"
+import { wadToDecimal } from "../convert"
+import { ONE_BI, ZERO_ADDRESS, ZERO_BD, ZERO_BI, poolInfoUtilsAddressTable } from "../constants"
+import { PoolInfoUtils } from "../../../generated/templates/ERC20Pool/PoolInfoUtils"
 
 export function getLiquidationAuctionId(poolId: Bytes, loanId: Bytes, kickBlock: BigInt): Bytes {
     return poolId.concat(Bytes.fromUTF8('|' + loanId.toString() + '|' + kickBlock.toString()))
diff --git a/src/utils/loan.ts b/src/utils/pool/loan.ts
similarity index 82%
rename from src/utils/loan.ts
rename to src/utils/pool/loan.ts
index 5cce41d..b51ee8f 100644
--- a/src/utils/loan.ts
+++ b/src/utils/pool/loan.ts
@@ -1,9 +1,9 @@
 import { Address, BigDecimal, BigInt, Bytes, dataSource } from "@graphprotocol/graph-ts"
-import { PoolInfoUtils } from "../../generated/templates/ERC20Pool/PoolInfoUtils"
+import { PoolInfoUtils } from "../../../generated/templates/ERC20Pool/PoolInfoUtils"
 
-import { Loan }    from "../../generated/schema"
-import { poolInfoUtilsAddressTable, ZERO_BD, ZERO_BI } from "./constants"
-import { ERC20Pool } from '../../generated/templates/ERC20Pool/ERC20Pool'
+import { Loan }    from "../../../generated/schema"
+import { poolInfoUtilsAddressTable, ZERO_BD, ZERO_BI } from "../constants"
+import { ERC20Pool } from '../../../generated/templates/ERC20Pool/ERC20Pool'
 
 export function getLoanId(poolId: Bytes, accountId: Bytes): Bytes {
   return poolId.concat(Bytes.fromUTF8('|').concat(accountId))
diff --git a/src/utils/lp-allowances.ts b/src/utils/pool/lp-allowances.ts
similarity index 96%
rename from src/utils/lp-allowances.ts
rename to src/utils/pool/lp-allowances.ts
index 46cce71..b6c47b2 100644
--- a/src/utils/lp-allowances.ts
+++ b/src/utils/pool/lp-allowances.ts
@@ -1,6 +1,6 @@
 import { Address, BigDecimal, BigInt, Bytes } from "@graphprotocol/graph-ts"
-import { LPAllowance, LPAllowances } from "../../generated/schema";
-import { wadToDecimal } from "./convert";
+import { LPAllowance, LPAllowances } from "../../../generated/schema";
+import { wadToDecimal } from "../convert";
 
 export function getAllowancesId(poolId: Bytes, lenderId: Bytes, spenderId: Bytes): Bytes {
   return poolId.concat(Bytes.fromUTF8('|' + lenderId.toString() + '|' + spenderId.toString()))
diff --git a/src/utils/lp-transferors.ts b/src/utils/pool/lp-transferors.ts
similarity index 95%
rename from src/utils/lp-transferors.ts
rename to src/utils/pool/lp-transferors.ts
index 5ca563b..bf9aa9b 100644
--- a/src/utils/lp-transferors.ts
+++ b/src/utils/pool/lp-transferors.ts
@@ -1,5 +1,5 @@
 import { Address, Bytes } from "@graphprotocol/graph-ts"
-import { LPTransferorList, Pool } from "../../generated/schema";
+import { LPTransferorList, Pool } from "../../../generated/schema";
 
 export function getTransferorId(poolId: Bytes, lenderId: Bytes): Bytes {
   return poolId.concat(Bytes.fromUTF8('|' + lenderId.toString()));
diff --git a/src/utils/pool-factory.ts b/src/utils/pool/pool-factory.ts
similarity index 83%
rename from src/utils/pool-factory.ts
rename to src/utils/pool/pool-factory.ts
index 64acd6d..ab13a7e 100644
--- a/src/utils/pool-factory.ts
+++ b/src/utils/pool/pool-factory.ts
@@ -1,7 +1,7 @@
 import { Address } from "@graphprotocol/graph-ts"
-import { PoolFactory } from "../../generated/schema"
+import { PoolFactory } from "../../../generated/schema"
 
-import { ZERO_BI } from "./constants"
+import { ZERO_BI } from "../constants"
 
 export function loadOrCreateFactory(address: Address, poolType: string): PoolFactory {
   let factory = PoolFactory.load(address)
diff --git a/src/utils/pool.ts b/src/utils/pool/pool.ts
similarity index 96%
rename from src/utils/pool.ts
rename to src/utils/pool/pool.ts
index 2a99f7d..200c290 100644
--- a/src/utils/pool.ts
+++ b/src/utils/pool/pool.ts
@@ -1,13 +1,13 @@
 import { BigDecimal, BigInt, Bytes, Address, dataSource } from '@graphprotocol/graph-ts'
 
-import { LiquidationAuction, Pool, ReserveAuction, Token } from "../../generated/schema"
-import { ERC20Pool } from '../../generated/templates/ERC20Pool/ERC20Pool'
-import { PoolInfoUtils } from '../../generated/templates/ERC20Pool/PoolInfoUtils'
-
-import { poolInfoUtilsAddressTable, TEN_BI } from "./constants"
-import { decimalToWad, wadToDecimal } from './convert'
-import { getTokenBalance } from './token-erc20'
-import { wmul, wdiv } from './math'
+import { LiquidationAuction, Pool, ReserveAuction, Token } from "../../../generated/schema"
+import { ERC20Pool } from '../../../generated/templates/ERC20Pool/ERC20Pool'
+import { PoolInfoUtils } from '../../../generated/templates/ERC20Pool/PoolInfoUtils'
+
+import { poolInfoUtilsAddressTable, TEN_BI } from "../constants"
+import { decimalToWad, wadToDecimal } from '../convert'
+import { getTokenBalance } from '../token-erc20'
+import { wmul, wdiv } from '../math'
 
 export function getPoolAddress(poolId: Bytes): Address {
   return Address.fromBytes(poolId)
diff --git a/src/utils/reserve-auction.ts b/src/utils/pool/reserve-auction.ts
similarity index 90%
rename from src/utils/reserve-auction.ts
rename to src/utils/pool/reserve-auction.ts
index 42cf170..5e7b715 100644
--- a/src/utils/reserve-auction.ts
+++ b/src/utils/pool/reserve-auction.ts
@@ -1,6 +1,6 @@
 import { Address, BigDecimal, BigInt, Bytes } from "@graphprotocol/graph-ts"
-import { Pool, ReserveAuction } from "../../generated/schema"
-import { EXP_18_BD, ONE_BI, ZERO_BD, ZERO_BI } from "./constants"
+import { Pool, ReserveAuction } from "../../../generated/schema"
+import { EXP_18_BD, ONE_BI, ZERO_BD, ZERO_BI } from "../constants"
 
 export function getReserveAuctionId(poolId: Bytes, burnEpoch: BigInt): Bytes {
     return poolId.concat(Bytes.fromUTF8('|' + burnEpoch.toHexString()))
diff --git a/tests/erc-20-pool.test.ts b/tests/erc-20-pool.test.ts
index 9d3e9d5..85be05d 100644
--- a/tests/erc-20-pool.test.ts
+++ b/tests/erc-20-pool.test.ts
@@ -28,15 +28,15 @@ import {
   mockPoolInfoUtilsPoolUpdateCalls,
   mockTokenBalance
 } from "./utils/common"
-import { BucketInfo, getBucketId } from "../src/utils/bucket"
+import { BucketInfo, getBucketId } from "../src/utils/pool/bucket"
 import { addressToBytes, wadToDecimal } from "../src/utils/convert"
 import { FIVE_PERCENT_BI, MAX_PRICE, MAX_PRICE_BI, MAX_PRICE_INDEX, ONE_BI, ONE_PERCENT_BI, ONE_WAD_BI, ZERO_ADDRESS, ZERO_BD, ZERO_BI } from "../src/utils/constants"
 import { Account, Lend, Loan, Pool } from "../generated/schema"
-import { getLendId } from "../src/utils/lend"
-import { BorrowerInfo, getLoanId } from "../src/utils/loan"
-import { AuctionInfo, AuctionStatus, getLiquidationAuctionId } from "../src/utils/liquidation"
-import { BurnInfo, DebtInfo } from "../src/utils/pool"
-import { getReserveAuctionId } from "../src/utils/reserve-auction"
+import { getLendId } from "../src/utils/pool/lend"
+import { BorrowerInfo, getLoanId } from "../src/utils/pool/loan"
+import { AuctionInfo, AuctionStatus, getLiquidationAuctionId } from "../src/utils/pool/liquidation"
+import { BurnInfo, DebtInfo } from "../src/utils/pool/pool"
+import { getReserveAuctionId } from "../src/utils/pool/reserve-auction"
 import { wdiv, wmul } from "../src/utils/math"
 
 // Tests structure (matchstick-as >=0.5.0)
diff --git a/tests/position-manager.test.ts b/tests/position-manager.test.ts
index 9d6c2b1..362148b 100644
--- a/tests/position-manager.test.ts
+++ b/tests/position-manager.test.ts
@@ -14,8 +14,8 @@ import { assertPosition, createApprovalEvent, createBurnEvent, createMemorialize
 import { bigIntToBytes, wadToDecimal } from "../src/utils/convert"
 import { mockGetLPBValueInQuote, mockGetPoolKey, mockGetTokenName, mockGetTokenSymbol } from "./utils/common"
 import { Lend } from "../generated/schema"
-import { getLendId, loadOrCreateLend } from "../src/utils/lend"
-import { getBucketId } from "../src/utils/bucket"
+import { getLendId, loadOrCreateLend } from "../src/utils/pool/lend"
+import { getBucketId } from "../src/utils/pool/bucket"
 import { ZERO_BI } from "../src/utils/constants"
 
 // Tests structure (matchstick-as >=0.5.0)
diff --git a/tests/utils/common.ts b/tests/utils/common.ts
index 336163a..fcfb0e1 100644
--- a/tests/utils/common.ts
+++ b/tests/utils/common.ts
@@ -4,12 +4,12 @@ import { assert, createMockedFunction } from "matchstick-as"
 import { handlePoolCreated } from "../../src/erc-20-pool-factory"
 import { createPoolCreatedEvent } from "./erc-20-pool-factory-utils"
 
-import { BucketInfo } from "../../src/utils/bucket"
+import { BucketInfo } from "../../src/utils/pool/bucket"
 import { wadToDecimal } from "../../src/utils/convert"
 import { positionManagerAddressTable, poolInfoUtilsAddressTable, ZERO_BI, ONE_BI } from "../../src/utils/constants"
-import { BurnInfo, DebtInfo, LoansInfo, PoolPricesInfo, PoolUtilizationInfo, ReservesInfo } from "../../src/utils/pool"
-import { AuctionInfo, AuctionStatus } from "../../src/utils/liquidation"
-import { BorrowerInfo } from "../../src/utils/loan"
+import { BurnInfo, DebtInfo, LoansInfo, PoolPricesInfo, PoolUtilizationInfo, ReservesInfo } from "../../src/utils/pool/pool"
+import { AuctionInfo, AuctionStatus } from "../../src/utils/pool/liquidation"
+import { BorrowerInfo } from "../../src/utils/pool/loan"
 import { wdiv, wmin } from "../../src/utils/math"
 
 /*************************/