diff --git a/.gitmodules b/.gitmodules
index fb78b3487..d18685da3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/data-structures"]
-	path = lib/data-structures
-	url = https://github.com/morpho-labs/data-structures
 [submodule "lib/aave-v3-core"]
 	path = lib/aave-v3-core
 	url = https://github.com/aave/aave-v3-core
@@ -13,6 +10,9 @@
 [submodule "lib/solmate"]
 	path = lib/solmate
 	url = https://github.com/Rari-Capital/solmate
+[submodule "lib/morpho-data-structures"]
+	path = lib/morpho-data-structures
+	url = https://github.com/morpho-dao/morpho-data-structures
 [submodule "lib/morpho-utils"]
 	path = lib/morpho-utils
-	url = https://github.com/morpho-labs/morpho-utils
+	url = https://github.com/morpho-dao/morpho-utils
diff --git a/contracts/aave-v2/InterestRatesManager.sol b/contracts/aave-v2/InterestRatesManager.sol
index a3664dee9..3e4d95492 100644
--- a/contracts/aave-v2/InterestRatesManager.sol
+++ b/contracts/aave-v2/InterestRatesManager.sol
@@ -3,9 +3,9 @@ pragma solidity 0.8.13;
 
 import "./interfaces/aave/IAToken.sol";
 
-import "@morpho-labs/morpho-utils/math/PercentageMath.sol";
-import "@morpho-labs/morpho-utils/math/WadRayMath.sol";
-import "@morpho-labs/morpho-utils/math/Math.sol";
+import "@morpho-dao/morpho-utils/math/PercentageMath.sol";
+import "@morpho-dao/morpho-utils/math/WadRayMath.sol";
+import "@morpho-dao/morpho-utils/math/Math.sol";
 
 import "./MorphoStorage.sol";
 
diff --git a/contracts/aave-v2/Lens.sol b/contracts/aave-v2/Lens.sol
index 04aa0cbd4..520b5ff4b 100644
--- a/contracts/aave-v2/Lens.sol
+++ b/contracts/aave-v2/Lens.sol
@@ -8,10 +8,10 @@ import "./interfaces/IMorpho.sol";
 
 import {ReserveConfiguration} from "./libraries/aave/ReserveConfiguration.sol";
 import "@rari-capital/solmate/src/utils/SafeTransferLib.sol";
-import "@morpho-labs/data-structures/contracts/HeapOrdering.sol";
-import "@morpho-labs/morpho-utils/math/PercentageMath.sol";
-import "@morpho-labs/morpho-utils/math/WadRayMath.sol";
-import "@morpho-labs/morpho-utils/math/Math.sol";
+import "@morpho-dao/morpho-data-structures/HeapOrdering.sol";
+import "@morpho-dao/morpho-utils/math/PercentageMath.sol";
+import "@morpho-dao/morpho-utils/math/WadRayMath.sol";
+import "@morpho-dao/morpho-utils/math/Math.sol";
 
 /// @title Lens.
 /// @author Morpho Labs.
diff --git a/contracts/aave-v2/MorphoStorage.sol b/contracts/aave-v2/MorphoStorage.sol
index 4c140e029..f90ec79aa 100644
--- a/contracts/aave-v2/MorphoStorage.sol
+++ b/contracts/aave-v2/MorphoStorage.sol
@@ -8,7 +8,7 @@ import "./interfaces/IInterestRatesManager.sol";
 import "./interfaces/IIncentivesVault.sol";
 import "./interfaces/IRewardsManager.sol";
 
-import "@morpho-labs/data-structures/contracts/HeapOrdering.sol";
+import "@morpho-dao/morpho-data-structures/HeapOrdering.sol";
 import "./libraries/Types.sol";
 
 import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
diff --git a/contracts/aave-v2/MorphoUtils.sol b/contracts/aave-v2/MorphoUtils.sol
index 02faa4876..b1e2b8151 100644
--- a/contracts/aave-v2/MorphoUtils.sol
+++ b/contracts/aave-v2/MorphoUtils.sol
@@ -5,10 +5,10 @@ import "./interfaces/aave/IPriceOracleGetter.sol";
 import "./interfaces/aave/IAToken.sol";
 
 import "./libraries/aave/ReserveConfiguration.sol";
-import "@morpho-labs/morpho-utils/DelegateCall.sol";
-import "@morpho-labs/morpho-utils/math/PercentageMath.sol";
-import "@morpho-labs/morpho-utils/math/WadRayMath.sol";
-import "@morpho-labs/morpho-utils/math/Math.sol";
+import "@morpho-dao/morpho-utils/DelegateCall.sol";
+import "@morpho-dao/morpho-utils/math/PercentageMath.sol";
+import "@morpho-dao/morpho-utils/math/WadRayMath.sol";
+import "@morpho-dao/morpho-utils/math/Math.sol";
 
 import "./MorphoStorage.sol";
 
diff --git a/contracts/aave-v3/InterestRatesManager.sol b/contracts/aave-v3/InterestRatesManager.sol
index f3f53a8f8..897f5b152 100644
--- a/contracts/aave-v3/InterestRatesManager.sol
+++ b/contracts/aave-v3/InterestRatesManager.sol
@@ -3,9 +3,9 @@ pragma solidity 0.8.10;
 
 import "@aave/core-v3/contracts/interfaces/IAToken.sol";
 
-import "@morpho-labs/morpho-utils/math/PercentageMath.sol";
-import "@morpho-labs/morpho-utils/math/WadRayMath.sol";
-import "@morpho-labs/morpho-utils/math/Math.sol";
+import "@morpho-dao/morpho-utils/math/PercentageMath.sol";
+import "@morpho-dao/morpho-utils/math/WadRayMath.sol";
+import "@morpho-dao/morpho-utils/math/Math.sol";
 
 import "./MorphoStorage.sol";
 
diff --git a/contracts/aave-v3/Lens.sol b/contracts/aave-v3/Lens.sol
index dd4e0e8b1..1932f8555 100644
--- a/contracts/aave-v3/Lens.sol
+++ b/contracts/aave-v3/Lens.sol
@@ -7,11 +7,11 @@ import {IPool} from "./interfaces/aave/IPool.sol";
 import "./interfaces/IMorpho.sol";
 
 import "./libraries/aave/ReserveConfiguration.sol";
-import {PercentageMath} from "@morpho-labs/morpho-utils/math/PercentageMath.sol";
-import {WadRayMath} from "@morpho-labs/morpho-utils/math/WadRayMath.sol";
+import {PercentageMath} from "@morpho-dao/morpho-utils/math/PercentageMath.sol";
+import {WadRayMath} from "@morpho-dao/morpho-utils/math/WadRayMath.sol";
 import "@rari-capital/solmate/src/utils/SafeTransferLib.sol";
-import "@morpho-labs/data-structures/contracts/HeapOrdering.sol";
-import "@morpho-labs/morpho-utils/math/Math.sol";
+import "@morpho-dao/morpho-data-structures/HeapOrdering.sol";
+import "@morpho-dao/morpho-utils/math/Math.sol";
 
 /// @title Lens.
 /// @author Morpho Labs.
diff --git a/contracts/aave-v3/MorphoStorage.sol b/contracts/aave-v3/MorphoStorage.sol
index 2c82c8b28..aa71a5696 100644
--- a/contracts/aave-v3/MorphoStorage.sol
+++ b/contracts/aave-v3/MorphoStorage.sol
@@ -9,7 +9,7 @@ import "./interfaces/IInterestRatesManager.sol";
 import "./interfaces/IIncentivesVault.sol";
 import "./interfaces/IRewardsManager.sol";
 
-import "@morpho-labs/data-structures/contracts/HeapOrdering.sol";
+import "@morpho-dao/morpho-data-structures/HeapOrdering.sol";
 import "./libraries/Types.sol";
 
 import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
diff --git a/contracts/aave-v3/MorphoUtils.sol b/contracts/aave-v3/MorphoUtils.sol
index 8321491e3..57d3598db 100644
--- a/contracts/aave-v3/MorphoUtils.sol
+++ b/contracts/aave-v3/MorphoUtils.sol
@@ -5,10 +5,10 @@ import "@aave/core-v3/contracts/interfaces/IPriceOracleGetter.sol";
 import "@aave/core-v3/contracts/interfaces/IAToken.sol";
 
 import "./libraries/aave/ReserveConfiguration.sol";
-import "@morpho-labs/morpho-utils/DelegateCall.sol";
-import "@morpho-labs/morpho-utils/math/PercentageMath.sol";
-import "@morpho-labs/morpho-utils/math/WadRayMath.sol";
-import "@morpho-labs/morpho-utils/math/Math.sol";
+import "@morpho-dao/morpho-utils/DelegateCall.sol";
+import "@morpho-dao/morpho-utils/math/PercentageMath.sol";
+import "@morpho-dao/morpho-utils/math/WadRayMath.sol";
+import "@morpho-dao/morpho-utils/math/Math.sol";
 
 import "./MorphoStorage.sol";
 
diff --git a/contracts/compound/MorphoUtils.sol b/contracts/compound/MorphoUtils.sol
index 69c83f243..a5b59415f 100644
--- a/contracts/compound/MorphoUtils.sol
+++ b/contracts/compound/MorphoUtils.sol
@@ -4,7 +4,7 @@ pragma solidity 0.8.13;
 import "@rari-capital/solmate/src/utils/SafeTransferLib.sol";
 import "@openzeppelin/contracts/utils/math/Math.sol";
 import "./libraries/CompoundMath.sol";
-import "@morpho-labs/morpho-utils/DelegateCall.sol";
+import "@morpho-dao/morpho-utils/DelegateCall.sol";
 
 import "./MorphoStorage.sol";
 
diff --git a/lib/data-structures b/lib/morpho-data-structures
similarity index 100%
rename from lib/data-structures
rename to lib/morpho-data-structures
diff --git a/remappings.txt b/remappings.txt
index 0a00e7269..0a4b8bd07 100644
--- a/remappings.txt
+++ b/remappings.txt
@@ -1,6 +1,6 @@
 @forge-std/=lib/forge-std/src/
-@morpho-labs/morpho-utils/=lib/morpho-utils/src/
-@morpho-labs/data-structures/=lib/data-structures/
+@morpho-dao/morpho-utils/=lib/morpho-utils/src/
+@morpho-dao/morpho-data-structures/=lib/morpho-data-structures/contracts/
 @rari-capital/solmate/=lib/solmate/
 
 @aave/core-v3/=lib/aave-v3-core/
diff --git a/test-foundry/aave-v2/setup/TestSetup.sol b/test-foundry/aave-v2/setup/TestSetup.sol
index 1c1968903..de483e528 100644
--- a/test-foundry/aave-v2/setup/TestSetup.sol
+++ b/test-foundry/aave-v2/setup/TestSetup.sol
@@ -15,7 +15,7 @@ import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
 
 import {ReserveConfiguration} from "@contracts/aave-v2/libraries/aave/ReserveConfiguration.sol";
 import "@rari-capital/solmate/src/utils/SafeTransferLib.sol";
-import "@morpho-labs/morpho-utils/math/WadRayMath.sol";
+import "@morpho-dao/morpho-utils/math/WadRayMath.sol";
 import "@openzeppelin/contracts/utils/Strings.sol";
 import "@contracts/aave-v2/libraries/Types.sol";
 
diff --git a/test-foundry/aave-v2/setup/Utils.sol b/test-foundry/aave-v2/setup/Utils.sol
index cfd59a336..f5a9a08d2 100644
--- a/test-foundry/aave-v2/setup/Utils.sol
+++ b/test-foundry/aave-v2/setup/Utils.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GNU AGPLv3
 pragma solidity 0.8.13;
 
-import "@morpho-labs/morpho-utils/math/WadRayMath.sol";
+import "@morpho-dao/morpho-utils/math/WadRayMath.sol";
 
 import "@forge-std/Test.sol";
 
diff --git a/test-foundry/fuzzing/aave-v2/setup/TestSetupFuzzing.sol b/test-foundry/fuzzing/aave-v2/setup/TestSetupFuzzing.sol
index d6720afe6..d425acf80 100644
--- a/test-foundry/fuzzing/aave-v2/setup/TestSetupFuzzing.sol
+++ b/test-foundry/fuzzing/aave-v2/setup/TestSetupFuzzing.sol
@@ -15,7 +15,7 @@ import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.so
 import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
 
 import "@rari-capital/solmate/src/utils/SafeTransferLib.sol";
-import "@morpho-labs/morpho-utils/math/WadRayMath.sol";
+import "@morpho-dao/morpho-utils/math/WadRayMath.sol";
 import "@openzeppelin/contracts/utils/Strings.sol";
 import "@contracts/aave-v2/libraries/Types.sol";