From f2971e659c8ed9f60549309fc7ff8273e36a50f9 Mon Sep 17 00:00:00 2001
From: Andrea Franz <andrea@gravityblast.com>
Date: Fri, 3 Apr 2020 14:19:40 +0200
Subject: [PATCH] re-organize contracts

---
 contracts/GiftBucket.sol                 | 2 +-
 contracts/GiftBucketFactory.sol          | 4 ++--
 contracts/{ => erc20}/IERC20.sol         | 0
 contracts/{ => erc20}/IERC20Detailed.sol | 0
 contracts/{ => erc20}/StandardToken.sol  | 0
 contracts/{ => erc20}/TestToken.sol      | 0
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename contracts/{ => erc20}/IERC20.sol (100%)
 rename contracts/{ => erc20}/IERC20Detailed.sol (100%)
 rename contracts/{ => erc20}/StandardToken.sol (100%)
 rename contracts/{ => erc20}/TestToken.sol (100%)

diff --git a/contracts/GiftBucket.sol b/contracts/GiftBucket.sol
index ef17966..2aa70fb 100644
--- a/contracts/GiftBucket.sol
+++ b/contracts/GiftBucket.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.6.1;
 pragma experimental ABIEncoderV2;
 
-import "./IERC20.sol";
+import "./erc20/IERC20.sol";
 
 contract GiftBucket {
 
diff --git a/contracts/GiftBucketFactory.sol b/contracts/GiftBucketFactory.sol
index 399bb69..896631f 100644
--- a/contracts/GiftBucketFactory.sol
+++ b/contracts/GiftBucketFactory.sol
@@ -6,7 +6,7 @@ import "./Proxy.sol";
 contract GiftBucketFactory {
   GiftBucket public GiftBucketImplementation;
 
-  event Created(address indexed gifter, address indexed bucket);
+  event BucketCreated(address indexed gifter, address indexed bucket);
 
   constructor() public {
     GiftBucketImplementation = new GiftBucket(address(0), block.timestamp + 1);
@@ -14,7 +14,7 @@ contract GiftBucketFactory {
 
   function create(address _tokenAddress, uint256 _expirationTime) public returns (address) {
     address p = address(new Proxy(abi.encodeWithSelector(0xc350a1b5, _tokenAddress, _expirationTime, msg.sender), address(GiftBucketImplementation)));
-    emit Created(msg.sender, p);
+    emit BucketCreated(msg.sender, p);
     return p;
   }
 }
diff --git a/contracts/IERC20.sol b/contracts/erc20/IERC20.sol
similarity index 100%
rename from contracts/IERC20.sol
rename to contracts/erc20/IERC20.sol
diff --git a/contracts/IERC20Detailed.sol b/contracts/erc20/IERC20Detailed.sol
similarity index 100%
rename from contracts/IERC20Detailed.sol
rename to contracts/erc20/IERC20Detailed.sol
diff --git a/contracts/StandardToken.sol b/contracts/erc20/StandardToken.sol
similarity index 100%
rename from contracts/StandardToken.sol
rename to contracts/erc20/StandardToken.sol
diff --git a/contracts/TestToken.sol b/contracts/erc20/TestToken.sol
similarity index 100%
rename from contracts/TestToken.sol
rename to contracts/erc20/TestToken.sol