diff --git a/core/contracts/lib/ERC4626RouterBase.sol b/core/contracts/lib/erc4626/ERC4626RouterBase.sol
similarity index 100%
rename from core/contracts/lib/ERC4626RouterBase.sol
rename to core/contracts/lib/erc4626/ERC4626RouterBase.sol
diff --git a/core/contracts/lib/external/Multicall.sol b/core/contracts/lib/erc4626/external/Multicall.sol
similarity index 100%
rename from core/contracts/lib/external/Multicall.sol
rename to core/contracts/lib/erc4626/external/Multicall.sol
diff --git a/core/contracts/lib/external/PeripheryPayments.sol b/core/contracts/lib/erc4626/external/PeripheryPayments.sol
similarity index 100%
rename from core/contracts/lib/external/PeripheryPayments.sol
rename to core/contracts/lib/erc4626/external/PeripheryPayments.sol
diff --git a/core/contracts/lib/external/SelfPermit.sol b/core/contracts/lib/erc4626/external/SelfPermit.sol
similarity index 100%
rename from core/contracts/lib/external/SelfPermit.sol
rename to core/contracts/lib/erc4626/external/SelfPermit.sol
diff --git a/core/contracts/lib/external/interfaces/IERC20PermitAllowed.sol b/core/contracts/lib/erc4626/external/interfaces/IERC20PermitAllowed.sol
similarity index 100%
rename from core/contracts/lib/external/interfaces/IERC20PermitAllowed.sol
rename to core/contracts/lib/erc4626/external/interfaces/IERC20PermitAllowed.sol
diff --git a/core/contracts/lib/external/interfaces/IMulticall.sol b/core/contracts/lib/erc4626/external/interfaces/IMulticall.sol
similarity index 100%
rename from core/contracts/lib/external/interfaces/IMulticall.sol
rename to core/contracts/lib/erc4626/external/interfaces/IMulticall.sol
diff --git a/core/contracts/lib/external/interfaces/ISelfPermit.sol b/core/contracts/lib/erc4626/external/interfaces/ISelfPermit.sol
similarity index 100%
rename from core/contracts/lib/external/interfaces/ISelfPermit.sol
rename to core/contracts/lib/erc4626/external/interfaces/ISelfPermit.sol
diff --git a/core/contracts/lib/interfaces/IERC4626.sol b/core/contracts/lib/erc4626/interfaces/IERC4626.sol
similarity index 100%
rename from core/contracts/lib/interfaces/IERC4626.sol
rename to core/contracts/lib/erc4626/interfaces/IERC4626.sol
diff --git a/core/contracts/lib/interfaces/IERC4626RouterBase.sol b/core/contracts/lib/erc4626/interfaces/IERC4626RouterBase.sol
similarity index 100%
rename from core/contracts/lib/interfaces/IERC4626RouterBase.sol
rename to core/contracts/lib/erc4626/interfaces/IERC4626RouterBase.sol
diff --git a/core/contracts/lib/interfaces/IxERC4626.sol b/core/contracts/lib/erc4626/interfaces/IxERC4626.sol
similarity index 100%
rename from core/contracts/lib/interfaces/IxERC4626.sol
rename to core/contracts/lib/erc4626/interfaces/IxERC4626.sol
diff --git a/core/contracts/lib/xERC4626.sol b/core/contracts/lib/erc4626/xERC4626.sol
similarity index 100%
rename from core/contracts/lib/xERC4626.sol
rename to core/contracts/lib/erc4626/xERC4626.sol