From 6002414275c0d586970a84baf4686ec31654d963 Mon Sep 17 00:00:00 2001
From: elenadimitrova <elena@arenabg.com>
Date: Wed, 6 May 2020 11:25:21 +0300
Subject: [PATCH] Move base contracts under infrastructure folder as they're
 only relevant and used there

---
 contracts/infrastructure/CompoundRegistry.sol      | 2 +-
 contracts/infrastructure/MakerRegistry.sol         | 2 +-
 contracts/infrastructure/ModuleRegistry.sol        | 2 +-
 contracts/infrastructure/TokenPriceProvider.sol    | 2 +-
 contracts/infrastructure/WalletFactory.sol         | 4 ++--
 contracts/{ => infrastructure}/base/Managed.sol    | 0
 contracts/{ => infrastructure}/base/Owned.sol      | 0
 contracts/infrastructure/ens/ArgentENSManager.sol  | 2 +-
 contracts/infrastructure/ens/ArgentENSResolver.sol | 4 ++--
 9 files changed, 9 insertions(+), 9 deletions(-)
 rename contracts/{ => infrastructure}/base/Managed.sol (100%)
 rename contracts/{ => infrastructure}/base/Owned.sol (100%)

diff --git a/contracts/infrastructure/CompoundRegistry.sol b/contracts/infrastructure/CompoundRegistry.sol
index 7f6f5b6ba..357c2620d 100644
--- a/contracts/infrastructure/CompoundRegistry.sol
+++ b/contracts/infrastructure/CompoundRegistry.sol
@@ -14,7 +14,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 pragma solidity ^0.5.4;
-import "../base/Owned.sol";
+import "./base/Owned.sol";
 
 /**
  * @title CompoundRegistry
diff --git a/contracts/infrastructure/MakerRegistry.sol b/contracts/infrastructure/MakerRegistry.sol
index 0913abb24..0e7a91e32 100644
--- a/contracts/infrastructure/MakerRegistry.sol
+++ b/contracts/infrastructure/MakerRegistry.sol
@@ -1,5 +1,5 @@
 pragma solidity ^0.5.4;
-import "../base/Owned.sol";
+import "./base/Owned.sol";
 import "../../lib/maker/MakerInterfaces.sol";
 
 /**
diff --git a/contracts/infrastructure/ModuleRegistry.sol b/contracts/infrastructure/ModuleRegistry.sol
index 5801bee69..f4c25f439 100644
--- a/contracts/infrastructure/ModuleRegistry.sol
+++ b/contracts/infrastructure/ModuleRegistry.sol
@@ -14,7 +14,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 pragma solidity ^0.5.4;
-import "../base/Owned.sol";
+import "./base/Owned.sol";
 import "../../lib/other/ERC20.sol";
 
 /**
diff --git a/contracts/infrastructure/TokenPriceProvider.sol b/contracts/infrastructure/TokenPriceProvider.sol
index a481128a4..29fe54eed 100644
--- a/contracts/infrastructure/TokenPriceProvider.sol
+++ b/contracts/infrastructure/TokenPriceProvider.sol
@@ -16,7 +16,7 @@
 pragma solidity ^0.5.4;
 import "openzeppelin-solidity/contracts/math/SafeMath.sol";
 import "../../lib/other/ERC20.sol";
-import "../base/Managed.sol";
+import "./base/Managed.sol";
 
 contract TokenPriceProvider is Managed {
     using SafeMath for uint256;
diff --git a/contracts/infrastructure/WalletFactory.sol b/contracts/infrastructure/WalletFactory.sol
index 8a87457f5..612eff4ee 100644
--- a/contracts/infrastructure/WalletFactory.sol
+++ b/contracts/infrastructure/WalletFactory.sol
@@ -16,8 +16,8 @@
 pragma solidity ^0.5.4;
 import "../wallet/Proxy.sol";
 import "../wallet/BaseWallet.sol";
-import "../base/Owned.sol";
-import "../base/Managed.sol";
+import "./base/Owned.sol";
+import "./base/Managed.sol";
 import "../infrastructure/ens/IENSManager.sol";
 import "../infrastructure/ModuleRegistry.sol";
 import "../modules/storage/IGuardianStorage.sol";
diff --git a/contracts/base/Managed.sol b/contracts/infrastructure/base/Managed.sol
similarity index 100%
rename from contracts/base/Managed.sol
rename to contracts/infrastructure/base/Managed.sol
diff --git a/contracts/base/Owned.sol b/contracts/infrastructure/base/Owned.sol
similarity index 100%
rename from contracts/base/Owned.sol
rename to contracts/infrastructure/base/Owned.sol
diff --git a/contracts/infrastructure/ens/ArgentENSManager.sol b/contracts/infrastructure/ens/ArgentENSManager.sol
index 8cf1b1447..ba77f9c94 100644
--- a/contracts/infrastructure/ens/ArgentENSManager.sol
+++ b/contracts/infrastructure/ens/ArgentENSManager.sol
@@ -19,7 +19,7 @@ import "../../../lib/utils/strings.sol";
 import "./IENSManager.sol";
 import "./ENSResolver.sol";
 import "./ENSReverseRegistrar.sol";
-import "../../base/Managed.sol";
+import "../base/Managed.sol";
 
 /**
  * @title ArgentENSManager
diff --git a/contracts/infrastructure/ens/ArgentENSResolver.sol b/contracts/infrastructure/ens/ArgentENSResolver.sol
index 6dd008c6c..3f5b0d998 100644
--- a/contracts/infrastructure/ens/ArgentENSResolver.sol
+++ b/contracts/infrastructure/ens/ArgentENSResolver.sol
@@ -14,8 +14,8 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 pragma solidity ^0.5.4;
-import "../../base/Owned.sol";
-import "../../base/Managed.sol";
+import "../base/Owned.sol";
+import "../base/Managed.sol";
 import "./ENSResolver.sol";
 
 /**