Refactor directory structure

src/openzeppelin/access/ownable.cairo → src/openzeppelin/access/library/Ownable.cairo

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (access/ownable.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (access/library/Ownable.cairo)
 
 %lang starknet
 

src/openzeppelin/account/IAccount.cairo → src/openzeppelin/account/interfaces/IAccount.cairo

@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (account/IAccount.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (account/interfaces/IAccount.cairo)
 
 %lang starknet
 
-from openzeppelin.account.library import AccountCallArray
+from openzeppelin.account.library.Account import AccountCallArray
 
 @contract_interface
 namespace IAccount:

src/openzeppelin/account/library.cairo → src/openzeppelin/account/library/Account.cairo

@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: MIT
+# OpenZeppelin Contracts for Cairo v0.2.0 (account/library/Account.cairo)
+
 %lang starknet
 
 from starkware.cairo.common.registers import get_fp_and_pc
@@ -9,7 +12,7 @@ from starkware.cairo.common.memcpy import memcpy
 from starkware.cairo.common.bool import TRUE
 from starkware.starknet.common.syscalls import call_contract, get_caller_address, get_tx_info
 
-from openzeppelin.introspection.ERC165 import ERC165
+from openzeppelin.introspection.library.ERC165 import ERC165
 
 from openzeppelin.utils.constants import IACCOUNT_ID
 

src/openzeppelin/account/Account.cairo → src/openzeppelin/account/presets/Account.cairo

@@ -1,13 +1,13 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (account/Account.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (account/presets/Account.cairo)
 
 %lang starknet
 
 from starkware.cairo.common.cairo_builtins import HashBuiltin, SignatureBuiltin
 
-from openzeppelin.account.library import Account, AccountCallArray
+from openzeppelin.account.library.Account import Account, AccountCallArray
 
-from openzeppelin.introspection.ERC165 import ERC165
+from openzeppelin.introspection.library.ERC165 import ERC165
 
 #
 # Constructor

src/openzeppelin/account/AddressRegistry.cairo → src/openzeppelin/account/presets/AddressRegistry.cairo

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (account/AddressRegistry.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (account/presets/AddressRegistry.cairo)
 
 %lang starknet
 

src/openzeppelin/introspection/IERC165.cairo → src/openzeppelin/introspection/interfaces/IERC165.cairo

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (introspection/IERC165.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (introspection/interfaces/IERC165.cairo)
 
 %lang starknet
 

src/openzeppelin/introspection/ERC165.cairo → src/openzeppelin/introspection/library/ERC165.cairo

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (introspection/ERC165.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (introspection/library/ERC165.cairo)
 
 %lang starknet
 

src/openzeppelin/security/initializable.cairo → src/openzeppelin/security/library/Initializable.cairo

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (security/initializable.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (security/library/Initializable.cairo)
 
 %lang starknet
 

src/openzeppelin/security/pausable.cairo → src/openzeppelin/security/library/Pausable.cairo

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (security/pausable.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (security/library/Pausable.cairo)
 
 %lang starknet
 

src/openzeppelin/security/reentrancy_guard.cairo → src/openzeppelin/security/library/ReentrancyGuard.cairo

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Cairo Contracts v0.1.0 (security/reentrancyguard.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (security/library/ReentrancyGuard.cairo)
 
 %lang starknet
 

src/openzeppelin/security/safemath.cairo → src/openzeppelin/security/library/SafeMath.cairo

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (security/safemath.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (security/library/SafeMath.cairo)
 
 %lang starknet
 

src/openzeppelin/token/erc20/interfaces/IERC20.cairo

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (token/erc20/interfaces/IERC20.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (token/erc20/interfaces/IERC20.cairo)
 
 %lang starknet
 

src/openzeppelin/token/erc20/library.cairo → src/openzeppelin/token/erc20/library/ERC20.cairo

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (token/erc20/library.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (token/erc20/library/ERC20.cairo)
 
 %lang starknet
 
@@ -10,7 +10,7 @@ from starkware.cairo.common.bool import TRUE, FALSE
 from starkware.cairo.common.uint256 import Uint256, uint256_check, uint256_eq, uint256_not
 
 from openzeppelin.utils.constants import UINT8_MAX
-from openzeppelin.security.safemath import SafeUint256
+from openzeppelin.security.library.SafeMath import SafeUint256
 
 #
 # Events

src/openzeppelin/token/erc20/ERC20.cairo → src/openzeppelin/token/erc20/presets/ERC20.cairo

@@ -1,13 +1,13 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (token/erc20/ERC20.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (token/erc20/presets/ERC20.cairo)
 
 %lang starknet
 
 from starkware.cairo.common.cairo_builtins import HashBuiltin
 from starkware.cairo.common.bool import TRUE
 from starkware.cairo.common.uint256 import Uint256
 
-from openzeppelin.token.erc20.library import ERC20
+from openzeppelin.token.erc20.library.ERC20 import ERC20
 
 @constructor
 func constructor{

src/openzeppelin/token/erc20/ERC20_Mintable.cairo → src/openzeppelin/token/erc20/presets/ERC20Mintable.cairo

@@ -1,15 +1,15 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (token/erc20/ERC20_Mintable.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (token/erc20/presets/ERC20Mintable.cairo)
 
 %lang starknet
 
 from starkware.cairo.common.cairo_builtins import HashBuiltin
 from starkware.cairo.common.uint256 import Uint256
 from starkware.cairo.common.bool import TRUE
 
-from openzeppelin.token.erc20.library import ERC20
+from openzeppelin.token.erc20.library.ERC20 import ERC20
 
-from openzeppelin.access.ownable import Ownable
+from openzeppelin.access.library.Ownable import Ownable
 
 @constructor
 func constructor{

src/openzeppelin/token/erc20/ERC20_Pausable.cairo → src/openzeppelin/token/erc20/presets/ERC20Pausable.cairo

@@ -1,17 +1,17 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (token/erc20/ERC20_Pausable.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (token/erc20/presets/ERC20Pausable.cairo)
 
 %lang starknet
 
 from starkware.cairo.common.cairo_builtins import HashBuiltin
 from starkware.cairo.common.bool import TRUE
 from starkware.cairo.common.uint256 import Uint256
 
-from openzeppelin.token.erc20.library import ERC20
+from openzeppelin.token.erc20.library.ERC20 import ERC20
 
-from openzeppelin.access.ownable import Ownable
+from openzeppelin.access.library.Ownable import Ownable
 
-from openzeppelin.security.pausable import Pausable
+from openzeppelin.security.library.Pausable import Pausable
 
 @constructor
 func constructor{

src/openzeppelin/token/erc20/ERC20_Upgradeable.cairo → src/openzeppelin/token/erc20/presets/ERC20Upgradeable.cairo

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (token/erc20/ERC20_Upgradeable.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (token/erc20/presets/ERC20Upgradeable.cairo)
 
 %lang starknet
 %builtins pedersen range_check
@@ -8,9 +8,9 @@ from starkware.cairo.common.cairo_builtins import HashBuiltin
 from starkware.cairo.common.bool import TRUE
 from starkware.cairo.common.uint256 import Uint256
 
-from openzeppelin.token.erc20.library import ERC20
+from openzeppelin.token.erc20.library.ERC20 import ERC20
 
-from openzeppelin.upgrades.library import Proxy
+from openzeppelin.upgrades.library.Proxy import Proxy
 
 #
 # Initializer

src/openzeppelin/token/erc721/interfaces/IERC721.cairo

@@ -1,11 +1,11 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (token/erc721/interfaces/IERC721.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (token/erc721/interfaces/IERC721.cairo)
 
 %lang starknet
 
 from starkware.cairo.common.uint256 import Uint256
 
-from openzeppelin.introspection.IERC165 import IERC165
+from openzeppelin.introspection.interfaces.IERC165 import IERC165
 
 @contract_interface
 namespace IERC721:

src/openzeppelin/token/erc721_enumerable/interfaces/IERC721_Enumerable.cairo → src/openzeppelin/token/erc721/interfaces/IERC721Enumerable.cairo

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (token/erc721_enumerable/interfaces/IERC721_Enumerable.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (token/erc721/interfaces/IERC721Enumerable.cairo)
 
 %lang starknet
 
@@ -8,7 +8,7 @@ from starkware.cairo.common.uint256 import Uint256
 from openzeppelin.token.erc721.interfaces.IERC721 import IERC721
 
 @contract_interface
-namespace IERC721_Enumerable:
+namespace IERC721Enumerable:
     func totalSupply() -> (totalSupply: Uint256):
     end
 

src/openzeppelin/token/erc721/interfaces/IERC721_Metadata.cairo → src/openzeppelin/token/erc721/interfaces/IERC721Metadata.cairo

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (token/erc721/interfaces/IERC721_Metadata.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (token/erc721/interfaces/IERC721Metadata.cairo)
 
 %lang starknet
 
@@ -8,7 +8,7 @@ from starkware.cairo.common.uint256 import Uint256
 from openzeppelin.token.erc721.interfaces.IERC721 import IERC721
 
 @contract_interface
-namespace IERC721_Metadata:
+namespace IERC721Metadata:
     func name() -> (name: felt):
     end
 

src/openzeppelin/token/erc721/interfaces/IERC721_Receiver.cairo → src/openzeppelin/token/erc721/interfaces/IERC721Receiver.cairo

@@ -1,12 +1,12 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (token/erc721/interfaces/IERC721_Receiver.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (token/erc721/interfaces/IERC721Receiver.cairo)
 
 %lang starknet
 
 from starkware.cairo.common.uint256 import Uint256
 
 @contract_interface
-namespace IERC721_Receiver:
+namespace IERC721Receiver:
     func onERC721Received(
         operator: felt,
         from_: felt,

src/openzeppelin/token/erc721/library.cairo → src/openzeppelin/token/erc721/library/ERC721.cairo

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (token/erc721/library.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (token/erc721/library/ERC721.cairo)
 
 %lang starknet
 
@@ -10,13 +10,13 @@ from starkware.cairo.common.alloc import alloc
 from starkware.cairo.common.bool import TRUE, FALSE
 from starkware.cairo.common.uint256 import Uint256, uint256_check
 
-from openzeppelin.security.safemath import SafeUint256
+from openzeppelin.security.library.SafeMath import SafeUint256
 
-from openzeppelin.introspection.ERC165 import ERC165
+from openzeppelin.introspection.library.ERC165 import ERC165
 
-from openzeppelin.token.erc721.interfaces.IERC721_Receiver import IERC721_Receiver
+from openzeppelin.token.erc721.interfaces.IERC721Receiver import IERC721Receiver
 
-from openzeppelin.introspection.IERC165 import IERC165
+from openzeppelin.introspection.interfaces.IERC165 import IERC165
 
 from openzeppelin.utils.constants import (
     IERC721_ID, IERC721_METADATA_ID, IERC721_RECEIVER_ID, IACCOUNT_ID
@@ -539,7 +539,7 @@ func _check_onERC721Received{
     let (caller) = get_caller_address()
     let (is_supported) = IERC165.supportsInterface(to, IERC721_RECEIVER_ID)
     if is_supported == TRUE:
-        let (selector) = IERC721_Receiver.onERC721Received(
+        let (selector) = IERC721Receiver.onERC721Received(
             to,
             caller,
             from_,

src/openzeppelin/token/erc721_enumerable/library.cairo → src/openzeppelin/token/erc721/library/ERC721Enumerable.cairo

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (token/erc721_enumerable/library.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (token/erc721/library/ERC721Enumerable.cairo)
 
 %lang starknet
 
@@ -11,12 +11,12 @@ from starkware.cairo.common.uint256 import (
     Uint256, uint256_lt, uint256_eq, uint256_check
 )
 
-from openzeppelin.introspection.ERC165 import ERC165
+from openzeppelin.introspection.library.ERC165 import ERC165
 from openzeppelin.utils.constants import IERC721_ENUMERABLE_ID
 
-from openzeppelin.security.safemath import SafeUint256
+from openzeppelin.security.library.SafeMath import SafeUint256
 
-from openzeppelin.token.erc721.library import (
+from openzeppelin.token.erc721.library.ERC721 import (
     ERC721_balanceOf,
     ERC721_ownerOf,
 

src/openzeppelin/token/erc721_enumerable/ERC721_Enumerable_Mintable_Burnable.cairo → src/openzeppelin/token/erc721/presets/ERC721EnumerableMintableBurnable.cairo

@@ -1,12 +1,12 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (token/erc721_enumerable/ERC721_Enumerable_Mintable_Burnable.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (token/erc721/presets/ERC721EnumerableMintableBurnable.cairo)
 
 %lang starknet
 
 from starkware.cairo.common.cairo_builtins import HashBuiltin, SignatureBuiltin
 from starkware.cairo.common.uint256 import Uint256
 
-from openzeppelin.token.erc721.library import (
+from openzeppelin.token.erc721.library.ERC721 import (
     ERC721_name,
     ERC721_symbol,
     ERC721_balanceOf,
@@ -22,7 +22,7 @@ from openzeppelin.token.erc721.library import (
     ERC721_setTokenURI
 )
 
-from openzeppelin.token.erc721_enumerable.library import (
+from openzeppelin.token.erc721.library.ERC721Enumerable import (
     ERC721_Enumerable_initializer,
     ERC721_Enumerable_totalSupply,
     ERC721_Enumerable_tokenByIndex,
@@ -33,9 +33,9 @@ from openzeppelin.token.erc721_enumerable.library import (
     ERC721_Enumerable_safeTransferFrom
 )
 
-from openzeppelin.introspection.ERC165 import ERC165
+from openzeppelin.introspection.library.ERC165 import ERC165
 
-from openzeppelin.access.ownable import Ownable
+from openzeppelin.access.library.Ownable import Ownable
 
 #
 # Constructor

src/openzeppelin/token/erc721/ERC721_Mintable_Burnable.cairo → src/openzeppelin/token/erc721/presets/ERC721MintableBurnable.cairo

@@ -1,12 +1,12 @@
 # SPDX-License-Identifier: MIT
-# OpenZeppelin Contracts for Cairo v0.1.0 (token/erc721/ERC721_Mintable_Burnable.cairo)
+# OpenZeppelin Contracts for Cairo v0.2.0 (token/erc721/presets/ERC721MintableBurnable.cairo)
 
 %lang starknet
 
 from starkware.cairo.common.cairo_builtins import HashBuiltin, SignatureBuiltin
 from starkware.cairo.common.uint256 import Uint256
 
-from openzeppelin.token.erc721.library import (
+from openzeppelin.token.erc721.library.ERC721 import (
     ERC721_name,
     ERC721_symbol,
     ERC721_balanceOf,
@@ -26,9 +26,9 @@ from openzeppelin.token.erc721.library import (
     ERC721_setTokenURI
 )
 
-from openzeppelin.introspection.ERC165 import ERC165
+from openzeppelin.introspection.library.ERC165 import ERC165
 
-from openzeppelin.access.ownable import Ownable
+from openzeppelin.access.library.Ownable import Ownable
 
 #
 # Constructor