Rename previous contracts, fix imports, add nested file structure

.gitignore

@@ -71,3 +71,6 @@ packages/website/public/bundle*
 
 # generated binaries
 bin/
+
+# contract artifacts
+packages/contracts/build/

packages/contracts/contracts/current/Exchange/Exchange.sol

@@ -18,9 +18,9 @@
 
 pragma solidity ^0.4.11;
 
-import "../TokenTransferProxy/TokenTransferProxy.sol";
-import "../../old/Token/v1.sol";
-import "../../old/SafeMath/v1.sol";
+import { TokenTransferProxy } from "../TokenTransferProxy/TokenTransferProxy.sol";
+import { Token_v1 as Token } from "../../previous/Token/Token_v1.sol";
+import { SafeMath_v1 as SafeMath } from "../../previous/SafeMath/SafeMath_v1.sol";
 
 /// @title Exchange - Facilitates exchange of ERC20 tokens.
 /// @author Amir Bandeali - <amir@0xProject.com>, Will Warren - <will@0xProject.com>

packages/contracts/contracts/current/TokenRegistry/TokenRegistry.sol

@@ -18,7 +18,7 @@
 
 pragma solidity ^0.4.11;
 
-import "../../old/Ownable/v1.sol";
+import { Ownable_v1 as Ownable } from "../../previous/Ownable/Ownable_v1.sol";
 
 /// @title Token Registry - Stores metadata associated with ERC20 tokens. See ERC22 https://github.com/ethereum/EIPs/issues/22
 /// @author Amir Bandeali - <amir@0xProject.com>, Will Warren - <will@0xProject.com>

packages/contracts/contracts/current/TokenTransferProxy/TokenTransferProxy.sol

@@ -18,8 +18,8 @@
 
 pragma solidity ^0.4.11;
 
-import "../../old/Token/v1.sol";
-import "../../old/Ownable/v1.sol";
+import { Token_v1 as Token } from "../../previous/Token/Token_v1.sol";
+import { Ownable_v1 as Ownable } from "../../previous/Ownable/Ownable_v1.sol";
 
 /// @title TokenTransferProxy - Transfers tokens on behalf of contracts that have been approved via decentralized governance.
 /// @author Amir Bandeali - <amir@0xProject.com>, Will Warren - <will@0xProject.com>

packages/contracts/contracts/current/multisig/MultiSigWalletWithTimeLock/MultiSigWalletWithTimeLock.sol

@@ -18,7 +18,7 @@
 
 pragma solidity ^0.4.11;
 
-import "../MultiSigWallet/MultiSigWallet.sol";
+import { MultiSigWallet } from "../MultiSigWallet/MultiSigWallet.sol";
 
 /// @title Multisignature wallet with time lock- Allows multiple parties to execute a transaction after a time lock has passed.
 /// @author Amir Bandeali - <amir@0xProject.com>

packages/contracts/contracts/current/multisig/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol

@@ -18,7 +18,7 @@
 
 pragma solidity ^0.4.11;
 
-import "../MultiSigWalletWithTimeLock/MultiSigWalletWithTimeLock.sol";
+import { MultiSigWalletWithTimeLock } from "../MultiSigWalletWithTimeLock/MultiSigWalletWithTimeLock.sol";
 
 contract MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress is MultiSigWalletWithTimeLock {
 

packages/contracts/contracts/current/test/DummyToken/DummyToken.sol

@@ -1,7 +1,7 @@
-pragma solidity 0.4.18;
+pragma solidity ^0.4.18;
 
-import "../Mintable/Mintable.sol";
-import "../Ownable/Ownable.sol";
+import { Mintable } from "../Mintable/Mintable.sol";
+import { Ownable } from "../../utils/Ownable/Ownable.sol";
 
 contract DummyToken is Mintable, Ownable {
     string public name;

packages/contracts/contracts/current/test/MaliciousToken/MaliciousToken.sol

@@ -1,8 +1,8 @@
-pragma solidity ^0.4.11;
+pragma solidity ^0.4.18;
 
-import "../StandardToken/StandardToken.sol";
+import { ERC20Token } from "../../tokens/ERC20Token/ERC20Token.sol";
 
-contract MaliciousToken is StandardToken {
+contract MaliciousToken is ERC20Token {
     uint8 stateToUpdate = 1;  // Not null so that change only requires 5000 gas
 
     function updateState()

packages/contracts/contracts/current/test/Mintable/Mintable.sol

@@ -1,7 +1,7 @@
-pragma solidity 0.4.18;
+pragma solidity ^0.4.18;
 
-import "../UnlimitedAllowanceToken/UnlimitedAllowanceToken.sol";
-import "../SafeMath/SafeMath.sol";
+import { UnlimitedAllowanceToken } from "../../tokens/UnlimitedAllowanceToken/UnlimitedAllowanceToken.sol";
+import { SafeMath } from "../../utils/SafeMath/SafeMath.sol";
 
 /*
  * Mintable

packages/contracts/contracts/current/tokens/ERC20Token/ERC20Token.sol

@@ -1,6 +1,6 @@
-pragma solidity 0.4.18;
+pragma solidity ^0.4.18;
 
-import "../Token/Token.sol";
+import { Token } from "../Token/Token.sol";
 
 contract ERC20Token is Token {
 

packages/contracts/contracts/current/tokens/Token/Token.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.4.18;
+pragma solidity ^0.4.18;
 
 contract Token {
 

packages/contracts/contracts/current/tokens/UnlimitedAllowanceToken/UnlimitedAllowanceToken.sol

@@ -16,9 +16,9 @@
 
 */
 
-pragma solidity 0.4.18;
+pragma solidity ^0.4.18;
 
-import "../ERC20Token/ERC20Token.sol";
+import { ERC20Token } from "../ERC20Token/ERC20Token.sol";
 
 contract UnlimitedAllowanceToken is ERC20Token {
 

packages/contracts/contracts/current/tokens/ZRXToken/ZRXToken.sol

@@ -18,7 +18,7 @@
 
 pragma solidity ^0.4.11;
 
-import "../../old/UnlimitedAllowanceToken/v1.sol";
+import { UnlimitedAllowanceToken_v1 as UnlimitedAllowanceToken } from "../../../previous/UnlimitedAllowanceToken/UnlimitedAllowanceToken_v1.sol";
 
 contract ZRXToken is UnlimitedAllowanceToken {
 

packages/contracts/contracts/current/utils/Ownable/Ownable.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.4.18;
+pragma solidity ^0.4.18;
 
 /*
  * Ownable

packages/contracts/contracts/current/utils/SafeMath/SafeMath.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.4.18;
+pragma solidity ^0.4.18;
 
 contract SafeMath {
     function safeMul(uint a, uint b)

packages/contracts/contracts/previous/ERC20Token/ERC20Token_v1.sol

@@ -1,8 +1,8 @@
 pragma solidity ^0.4.11;
 
-import "../../old/Token/v1.sol";
+import { Token_v1 as Token } from "../Token/Token_v1.sol";
 
-contract StandardToken is Token {
+contract ERC20Token_v1 is Token {
 
     function transfer(address _to, uint _value) returns (bool) {
         //Default assumes totalSupply can't be over max (2^256 - 1).

packages/contracts/contracts/previous/Ownable/Ownable_v1.sol

@@ -7,7 +7,7 @@ pragma solidity ^0.4.11;
  * Provides onlyOwner modifier, which prevents function from running if it is called by anyone other than the owner.
  */
 
-contract Ownable {
+contract Ownable_v1 {
     address public owner;
 
     function Ownable() {

packages/contracts/contracts/previous/SafeMath/SafeMath_v1.sol

@@ -1,6 +1,6 @@
 pragma solidity ^0.4.11;
 
-contract SafeMath {
+contract SafeMath_v1 {
     function safeMul(uint a, uint b)
         internal
         constant

packages/contracts/contracts/previous/Token/Token_v1.sol

@@ -1,6 +1,6 @@
 pragma solidity ^0.4.11;
 
-contract Token {
+contract Token_v1 {
 
     /// @return total amount of tokens
     function totalSupply() constant returns (uint supply) {}

packages/contracts/contracts/previous/UnlimitedAllowanceToken/UnlimitedAllowanceToken_v1.sol

@@ -18,9 +18,9 @@
 
 pragma solidity ^0.4.11;
 
-import "../../contracts/StandardToken/StandardToken.sol";
+import { ERC20Token_v1 as ERC20Token } from "../ERC20Token/ERC20Token_v1.sol";
 
-contract UnlimitedAllowanceToken is StandardToken {
+contract UnlimitedAllowanceToken_v1 is ERC20Token {
 
     uint constant MAX_UINT = 2**256 - 1;
 

packages/contracts/util/artifacts.ts

@@ -1,5 +1,4 @@
 import * as DummyTokenArtifact from '../build/artifacts/DummyToken.json';
-import * as DummyTokenV2Artifact from '../build/artifacts/DummyToken_v2.json';
 import * as ExchangeArtifact from '../build/artifacts/Exchange.json';
 import * as MaliciousTokenArtifact from '../build/artifacts/MaliciousToken.json';
 import * as MultiSigWalletWithTimeLockArtifact from '../build/artifacts/MultiSigWalletWithTimeLock.json';

packages/deployer/src/compiler.ts

@@ -181,7 +181,6 @@ export class Compiler {
         );
 
         if (!_.isUndefined(compiled.errors)) {
-            utils.consoleLog(compiled.errors);
             _.each(compiled.errors, errMsg => {
                 const normalizedErrMsg = Compiler._getNormalizedErrMsg(errMsg);
                 this._solcErrors.add(normalizedErrMsg);