diff --git a/contracts/mocks/UUPS/TestInProd.sol b/contracts/mocks/UUPS/TestInProd.sol
index 66bfbea37..13339ec7a 100644
--- a/contracts/mocks/UUPS/TestInProd.sol
+++ b/contracts/mocks/UUPS/TestInProd.sol
@@ -3,7 +3,7 @@
 pragma solidity ^0.8.0;
 
 import "../CountersImpl.sol";
-import "../../proxy/UUPS/UUPSUpgradeable.sol";
+import "../../proxy/utils/UUPSUpgradeable.sol";
 
 contract UUPSUpgradeableMock is CountersImpl, UUPSUpgradeable {
     // Not having any checks in this function is dangerous! Do not do this outside tests!
diff --git a/contracts/proxy/ERC1967/ERC1967Upgrade.sol b/contracts/proxy/ERC1967/ERC1967Upgrade.sol
index e93166634..828fb5934 100644
--- a/contracts/proxy/ERC1967/ERC1967Upgrade.sol
+++ b/contracts/proxy/ERC1967/ERC1967Upgrade.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.3;
+pragma solidity ^0.8.2;
 
 import "./ERC1967Storage.sol";
 
diff --git a/contracts/proxy/utils/Initializable.sol b/contracts/proxy/utils/Initializable.sol
index 592b514b7..af397bfca 100644
--- a/contracts/proxy/utils/Initializable.sol
+++ b/contracts/proxy/utils/Initializable.sol
@@ -3,8 +3,6 @@
 // solhint-disable-next-line compiler-version
 pragma solidity ^0.8.0;
 
-import "../../utils/Address.sol";
-
 /**
  * @dev This is a base contract to aid in writing upgradeable contracts, or any kind of contract that will be deployed
  * behind a proxy. Since a proxied contract can't have a constructor, it's common to move constructor logic to an
diff --git a/contracts/proxy/UUPS/UUPSUpgradeable.sol b/contracts/proxy/utils/UUPSUpgradeable.sol
similarity index 100%
rename from contracts/proxy/UUPS/UUPSUpgradeable.sol
rename to contracts/proxy/utils/UUPSUpgradeable.sol