Upgradeable Crowdsale

Author: munnatamton

Contracts/Crowdsale.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import "./ERC20Upgradeable.sol";
-import "./SafeMathUpgradeable.sol";
-import "./SafeERC20Upgradeable.sol";
+import "./ERC20/ERC20Upgradeable.sol";
+import "./utils/SafeMathUpgradeable.sol";
+import "./ERC20/SafeERC20Upgradeable.sol";
 
 
 /**
@@ -20,7 +20,7 @@ import "./SafeERC20Upgradeable.sol";
  */
 contract Crowdsale {
   using SafeMathUpgradeable for uint256;
-  using SafeERC20UpgradeableUpgradeable for ERC20Upgradeable;
+  using SafeERC20pgradeable for ERC20Upgradeable;
 
   // The token being sold
   ERC20Upgradeable public token;

Contracts/ERC20Upgradeable.sol renamed to Contracts/ERC20/ERC20Upgradeable.sol

@@ -5,8 +5,8 @@ pragma solidity ^0.8.0;
 
 import "./IERC20Upgradeable.sol";
 import "./IERC20MetadataUpgradeable.sol";
-import "./ContextUpgradeable.sol";
-import "./Initializable.sol";
+import ".././utils/ContextUpgradeable.sol";
+import ".././utils/Initializable.sol";
 
 /**
  * @dev Implementation of the {IERC20Upgradeable} interface.
@@ -33,7 +33,7 @@ import "./Initializable.sol";
  * functions have been added to mitigate the well-known issues around setting
  * allowances. See {IERC20Upgradeable-approve}.
  */
-contract ERC20UpgradeableUpgradeable is Initializable, ContextUpgradeable, IERC20UpgradeableUpgradeable, IERC20UpgradeableMetadataUpgradeable {
+contract ERC20Upgradeable is Initializable, ContextUpgradeable, IERC20Upgradeable, IERC20MetadataUpgradeable {
     mapping(address => uint256) private _balances;
 
     mapping(address => mapping(address => uint256)) private _allowances;

Contracts/IERC20MetadataUpgradeable.sol renamed to Contracts/ERC20/IERC20MetadataUpgradeable.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.8.0;
 
 import "./IERC20Upgradeable.sol";
-import "./AddressUpgradeable.sol";
+import ".././utils/AddressUpgradeable.sol";
 
 /**
  * @title SafeERC20Upgradeable
@@ -15,19 +15,19 @@ import "./AddressUpgradeable.sol";
  * To use this library you can add a `using SafeERC20Upgradeable for IERC20Upgradeable;` statement to your contract,
  * which allows you to call the safe operations as `token.safeTransfer(...)`, etc.
  */
-library SafeERC20UpgradeableUpgradeable {
+library SafeERC20pgradeable {
     using AddressUpgradeable for address;
 
     function safeTransfer(
-        IERC20UpgradeableUpgradeable token,
+        IERC20Upgradeable token,
         address to,
         uint256 value
     ) internal {
         _callOptionalReturn(token, abi.encodeWithSelector(token.transfer.selector, to, value));
     }
 
     function safeTransferFrom(
-        IERC20UpgradeableUpgradeable token,
+        IERC20Upgradeable token,
         address from,
         address to,
         uint256 value
@@ -43,7 +43,7 @@ library SafeERC20UpgradeableUpgradeable {
      * {safeDecreaseAllowance} instead.
      */
     function safeApprove(
-        IERC20UpgradeableUpgradeable token,
+        IERC20Upgradeable token,
         address spender,
         uint256 value
     ) internal {
@@ -58,7 +58,7 @@ library SafeERC20UpgradeableUpgradeable {
     }
 
     function safeIncreaseAllowance(
-        IERC20UpgradeableUpgradeable token,
+        IERC20Upgradeable token,
         address spender,
         uint256 value
     ) internal {
@@ -67,7 +67,7 @@ library SafeERC20UpgradeableUpgradeable {
     }
 
     function safeDecreaseAllowance(
-        IERC20UpgradeableUpgradeable token,
+        IERC20Upgradeable token,
         address spender,
         uint256 value
     ) internal {
@@ -85,7 +85,7 @@ library SafeERC20UpgradeableUpgradeable {
      * @param token The token targeted by the call.
      * @param data The call data (encoded using abi.encode or one of its variants).
      */
-    function _callOptionalReturn(IERC20UpgradeableUpgradeable token, bytes memory data) private {
+    function _callOptionalReturn(IERC20Upgradeable token, bytes memory data) private {
         // We need to perform a low level call here, to bypass Solidity's return data size checking mechanism, since
         // we're implementing it ourselves. We use {Address.functionCall} to perform this call, which verifies that
         // the target address contains contract code and also asserts for success in the low-level call.

Contracts/IERC20Upgradeable.sol renamed to Contracts/ERC20/IERC20Upgradeable.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 
 pragma solidity ^0.8.0;
-import "./Initializable.sol";
+import ".././utils/Initializable.sol";
 
 /**
  * @dev Provides information about the current execution context, including the