From 95ae1be5733c4681cc40aa4a1b59bd94bbd7fa5c Mon Sep 17 00:00:00 2001
From: Pablo Veyrat <veyratpablo@gmail.com>
Date: Wed, 23 Oct 2024 12:45:39 +0200
Subject: [PATCH] reorg files

---
 contracts/{ => partners}/TokenLocker.sol                      | 0
 .../middleman/MerklFraxIncentivizationHandler.sol             | 2 +-
 contracts/{ => partners}/middleman/MerklGaugeMiddleman.sol    | 2 +-
 .../{ => partners}/middleman/MerklGaugeMiddlemanPolygon.sol   | 0
 contracts/{ => partners}/tokenWrappers/AaveTokenWrapper.sol   | 4 ++--
 contracts/{ => partners}/tokenWrappers/BaseTokenWrapper.sol   | 2 +-
 .../{ => partners}/tokenWrappers/RadiantTokenWrapper.sol      | 0
 contracts/{ => partners}/tokenWrappers/StakedToken.sol        | 0
 8 files changed, 5 insertions(+), 5 deletions(-)
 rename contracts/{ => partners}/TokenLocker.sol (100%)
 rename contracts/{ => partners}/middleman/MerklFraxIncentivizationHandler.sol (99%)
 rename contracts/{ => partners}/middleman/MerklGaugeMiddleman.sol (99%)
 rename contracts/{ => partners}/middleman/MerklGaugeMiddlemanPolygon.sol (100%)
 rename contracts/{ => partners}/tokenWrappers/AaveTokenWrapper.sol (98%)
 rename contracts/{ => partners}/tokenWrappers/BaseTokenWrapper.sol (98%)
 rename contracts/{ => partners}/tokenWrappers/RadiantTokenWrapper.sol (100%)
 rename contracts/{ => partners}/tokenWrappers/StakedToken.sol (100%)

diff --git a/contracts/TokenLocker.sol b/contracts/partners/TokenLocker.sol
similarity index 100%
rename from contracts/TokenLocker.sol
rename to contracts/partners/TokenLocker.sol
diff --git a/contracts/middleman/MerklFraxIncentivizationHandler.sol b/contracts/partners/middleman/MerklFraxIncentivizationHandler.sol
similarity index 99%
rename from contracts/middleman/MerklFraxIncentivizationHandler.sol
rename to contracts/partners/middleman/MerklFraxIncentivizationHandler.sol
index c67794d..e5e54c4 100644
--- a/contracts/middleman/MerklFraxIncentivizationHandler.sol
+++ b/contracts/partners/middleman/MerklFraxIncentivizationHandler.sol
@@ -6,7 +6,7 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";
 
-import "../DistributionCreator.sol";
+import "../../DistributionCreator.sol";
 
 /// @title MerklFraxIncentivizationHandler
 /// @author Angle Labs, Inc.
diff --git a/contracts/middleman/MerklGaugeMiddleman.sol b/contracts/partners/middleman/MerklGaugeMiddleman.sol
similarity index 99%
rename from contracts/middleman/MerklGaugeMiddleman.sol
rename to contracts/partners/middleman/MerklGaugeMiddleman.sol
index e4467d3..950efcd 100644
--- a/contracts/middleman/MerklGaugeMiddleman.sol
+++ b/contracts/partners/middleman/MerklGaugeMiddleman.sol
@@ -38,7 +38,7 @@ pragma solidity ^0.8.17;
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
-import "../DistributionCreator.sol";
+import "../../DistributionCreator.sol";
 
 /// @title MerklGaugeMiddleman
 /// @author Angle Labs, Inc.
diff --git a/contracts/middleman/MerklGaugeMiddlemanPolygon.sol b/contracts/partners/middleman/MerklGaugeMiddlemanPolygon.sol
similarity index 100%
rename from contracts/middleman/MerklGaugeMiddlemanPolygon.sol
rename to contracts/partners/middleman/MerklGaugeMiddlemanPolygon.sol
diff --git a/contracts/tokenWrappers/AaveTokenWrapper.sol b/contracts/partners/tokenWrappers/AaveTokenWrapper.sol
similarity index 98%
rename from contracts/tokenWrappers/AaveTokenWrapper.sol
rename to contracts/partners/tokenWrappers/AaveTokenWrapper.sol
index a258f46..e2ddab3 100644
--- a/contracts/tokenWrappers/AaveTokenWrapper.sol
+++ b/contracts/partners/tokenWrappers/AaveTokenWrapper.sol
@@ -5,9 +5,9 @@ pragma solidity ^0.8.17;
 import { ERC20Upgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
 import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import "../DistributionCreator.sol";
+import "../../DistributionCreator.sol";
 
-import "../utils/UUPSHelper.sol";
+import "../../utils/UUPSHelper.sol";
 
 contract AaveTokenWrapper is UUPSHelper, ERC20Upgradeable {
     using SafeERC20 for IERC20;
diff --git a/contracts/tokenWrappers/BaseTokenWrapper.sol b/contracts/partners/tokenWrappers/BaseTokenWrapper.sol
similarity index 98%
rename from contracts/tokenWrappers/BaseTokenWrapper.sol
rename to contracts/partners/tokenWrappers/BaseTokenWrapper.sol
index 02604d0..959369a 100644
--- a/contracts/tokenWrappers/BaseTokenWrapper.sol
+++ b/contracts/partners/tokenWrappers/BaseTokenWrapper.sol
@@ -6,7 +6,7 @@ import { ERC20Upgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC2
 import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import { IERC20, IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
-import "../utils/UUPSHelper.sol";
+import "../../utils/UUPSHelper.sol";
 
 interface IDistributionCreator {
     function distributor() external view returns (address);
diff --git a/contracts/tokenWrappers/RadiantTokenWrapper.sol b/contracts/partners/tokenWrappers/RadiantTokenWrapper.sol
similarity index 100%
rename from contracts/tokenWrappers/RadiantTokenWrapper.sol
rename to contracts/partners/tokenWrappers/RadiantTokenWrapper.sol
diff --git a/contracts/tokenWrappers/StakedToken.sol b/contracts/partners/tokenWrappers/StakedToken.sol
similarity index 100%
rename from contracts/tokenWrappers/StakedToken.sol
rename to contracts/partners/tokenWrappers/StakedToken.sol