diff --git a/README.md b/README.md
index d858d8d..7c38716 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ It can create an account from a String (seed) or from a File (keystore)
 
 ####EthereumFacadeProvider
 This is the provider used to connect through EthereumJ. 
-The different pre-defined configurations can be found at org.adridadou.ethereum.provider.EthereumJConfigs
+The different pre-defined configurations can be found at org.adridadou.ethereum.ethj.provider.EthereumJConfigs
 You can use the function "from" that takes a configuration.
 This returns a Provider Builder. You can then extend the configuration. This is useful when you want to connect to Ropsten but with fast sync (for example)
 
diff --git a/src/main/java/org/adridadou/ethereum/blockchain/EthereumBackend.java b/src/main/java/org/adridadou/ethereum/EthereumBackend.java
similarity index 95%
rename from src/main/java/org/adridadou/ethereum/blockchain/EthereumBackend.java
rename to src/main/java/org/adridadou/ethereum/EthereumBackend.java
index 62eb5c0..6202850 100644
--- a/src/main/java/org/adridadou/ethereum/blockchain/EthereumBackend.java
+++ b/src/main/java/org/adridadou/ethereum/EthereumBackend.java
@@ -1,4 +1,4 @@
-package org.adridadou.ethereum.blockchain;
+package org.adridadou.ethereum;
 
 import org.adridadou.ethereum.event.EthereumEventHandler;
 import org.adridadou.ethereum.values.*;
diff --git a/src/main/java/org/adridadou/ethereum/EthereumContractInvocationHandler.java b/src/main/java/org/adridadou/ethereum/EthereumContractInvocationHandler.java
index 3a7030c..f08adaa 100644
--- a/src/main/java/org/adridadou/ethereum/EthereumContractInvocationHandler.java
+++ b/src/main/java/org/adridadou/ethereum/EthereumContractInvocationHandler.java
@@ -1,10 +1,8 @@
 package org.adridadou.ethereum;
 
 import com.google.common.collect.Sets;
-import org.adridadou.ethereum.blockchain.EthereumProxy;
 import org.adridadou.ethereum.converters.input.*;
 import org.adridadou.ethereum.converters.output.*;
-import org.adridadou.ethereum.smartcontract.SmartContract;
 import org.adridadou.ethereum.values.*;
 import org.adridadou.exception.EthereumApiException;
 import org.ethereum.core.CallTransaction;
diff --git a/src/main/java/org/adridadou/ethereum/EthereumFacade.java b/src/main/java/org/adridadou/ethereum/EthereumFacade.java
index 662c73e..4198138 100644
--- a/src/main/java/org/adridadou/ethereum/EthereumFacade.java
+++ b/src/main/java/org/adridadou/ethereum/EthereumFacade.java
@@ -9,7 +9,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.google.common.base.Charsets;
-import org.adridadou.ethereum.blockchain.EthereumProxy;
 import org.adridadou.ethereum.converters.input.InputTypeConverter;
 import org.adridadou.ethereum.converters.input.InputTypeHandler;
 import org.adridadou.ethereum.converters.output.OutputTypeConverter;
diff --git a/src/main/java/org/adridadou/ethereum/blockchain/EthereumProxy.java b/src/main/java/org/adridadou/ethereum/EthereumProxy.java
similarity index 98%
rename from src/main/java/org/adridadou/ethereum/blockchain/EthereumProxy.java
rename to src/main/java/org/adridadou/ethereum/EthereumProxy.java
index b73a6a4..a6e23b2 100644
--- a/src/main/java/org/adridadou/ethereum/blockchain/EthereumProxy.java
+++ b/src/main/java/org/adridadou/ethereum/EthereumProxy.java
@@ -1,4 +1,4 @@
-    package org.adridadou.ethereum.blockchain;
+    package org.adridadou.ethereum;
 
     import static org.adridadou.ethereum.values.EthValue.wei;
 
@@ -13,7 +13,6 @@
     import org.adridadou.ethereum.converters.input.InputTypeHandler;
     import org.adridadou.ethereum.converters.output.OutputTypeHandler;
     import org.adridadou.ethereum.event.*;
-    import org.adridadou.ethereum.smartcontract.SmartContract;
     import org.adridadou.ethereum.values.CompiledContract;
     import org.adridadou.ethereum.values.ContractAbi;
     import org.adridadou.ethereum.values.EthAccount;
diff --git a/src/main/java/org/adridadou/ethereum/smartcontract/SmartContract.java b/src/main/java/org/adridadou/ethereum/SmartContract.java
similarity index 94%
rename from src/main/java/org/adridadou/ethereum/smartcontract/SmartContract.java
rename to src/main/java/org/adridadou/ethereum/SmartContract.java
index e7ddff3..bdab6d4 100644
--- a/src/main/java/org/adridadou/ethereum/smartcontract/SmartContract.java
+++ b/src/main/java/org/adridadou/ethereum/SmartContract.java
@@ -1,4 +1,4 @@
-package org.adridadou.ethereum.smartcontract;
+package org.adridadou.ethereum;
 
 import java.util.Arrays;
 import java.util.List;
@@ -7,8 +7,6 @@
 import java.util.stream.Collectors;
 
 import com.google.common.collect.Lists;
-import org.adridadou.ethereum.blockchain.EthereumBackend;
-import org.adridadou.ethereum.blockchain.EthereumProxy;
 import org.adridadou.ethereum.values.EthAccount;
 import org.adridadou.ethereum.values.EthAddress;
 import org.adridadou.ethereum.values.EthData;
diff --git a/src/main/java/org/adridadou/ethereum/blockchain/BlockchainConfig.java b/src/main/java/org/adridadou/ethereum/ethj/BlockchainConfig.java
similarity index 99%
rename from src/main/java/org/adridadou/ethereum/blockchain/BlockchainConfig.java
rename to src/main/java/org/adridadou/ethereum/ethj/BlockchainConfig.java
index ef4cbed..1679626 100644
--- a/src/main/java/org/adridadou/ethereum/blockchain/BlockchainConfig.java
+++ b/src/main/java/org/adridadou/ethereum/ethj/BlockchainConfig.java
@@ -1,4 +1,4 @@
-package org.adridadou.ethereum.blockchain;
+package org.adridadou.ethereum.ethj;
 
 import org.adridadou.ethereum.values.config.*;
 
diff --git a/src/main/java/org/adridadou/ethereum/blockchain/EthereumReal.java b/src/main/java/org/adridadou/ethereum/ethj/EthereumReal.java
similarity index 89%
rename from src/main/java/org/adridadou/ethereum/blockchain/EthereumReal.java
rename to src/main/java/org/adridadou/ethereum/ethj/EthereumReal.java
index 47c09c1..9d8620b 100644
--- a/src/main/java/org/adridadou/ethereum/blockchain/EthereumReal.java
+++ b/src/main/java/org/adridadou/ethereum/ethj/EthereumReal.java
@@ -1,7 +1,7 @@
-package org.adridadou.ethereum.blockchain;
+package org.adridadou.ethereum.ethj;
 
+import org.adridadou.ethereum.EthereumBackend;
 import org.adridadou.ethereum.event.EthereumEventHandler;
-import org.adridadou.ethereum.provider.LocalExecutionServiceImpl;
 import org.adridadou.ethereum.values.*;
 import org.adridadou.ethereum.values.config.ChainId;
 import org.ethereum.core.*;
@@ -16,11 +16,11 @@
  */
 public class EthereumReal implements EthereumBackend {
     private final Ethereum ethereum;
-    private final LocalExecutionServiceImpl localExecutionService;
+    private final LocalExecutionService localExecutionService;
 
     public EthereumReal(Ethereum ethereum, ChainId chainId) {
         this.ethereum = ethereum;
-        this.localExecutionService = new LocalExecutionServiceImpl((BlockchainImpl)ethereum.getBlockchain(), chainId);
+        this.localExecutionService = new LocalExecutionService((BlockchainImpl)ethereum.getBlockchain(), chainId);
     }
 
     @Override
diff --git a/src/main/java/org/adridadou/ethereum/blockchain/EthereumTest.java b/src/main/java/org/adridadou/ethereum/ethj/EthereumTest.java
similarity index 85%
rename from src/main/java/org/adridadou/ethereum/blockchain/EthereumTest.java
rename to src/main/java/org/adridadou/ethereum/ethj/EthereumTest.java
index bf942be..0d89652 100644
--- a/src/main/java/org/adridadou/ethereum/blockchain/EthereumTest.java
+++ b/src/main/java/org/adridadou/ethereum/ethj/EthereumTest.java
@@ -1,13 +1,14 @@
-package org.adridadou.ethereum.blockchain;
+package org.adridadou.ethereum.ethj;
 
+import org.adridadou.ethereum.EthereumBackend;
 import org.adridadou.ethereum.event.EthereumEventHandler;
 import org.adridadou.ethereum.keystore.AccountProvider;
-import org.adridadou.ethereum.provider.LocalExecutionServiceImpl;
 import org.adridadou.ethereum.values.*;
 import org.adridadou.ethereum.values.config.ChainId;
 import org.adridadou.exception.EthereumApiException;
 import org.ethereum.config.SystemProperties;
 import org.ethereum.config.blockchain.FrontierConfig;
+import org.ethereum.config.blockchain.HomesteadConfig;
 import org.ethereum.core.Block;
 import org.ethereum.core.Repository;
 import org.ethereum.core.Transaction;
@@ -24,12 +25,12 @@
  */
 public class EthereumTest implements EthereumBackend {
     private final StandaloneBlockchain blockchain;
-    private final TestConfig config;
+    private final TestConfig testConfig;
     private final BlockingQueue<Transaction> transactions = new ArrayBlockingQueue<>(100);
-    private final LocalExecutionServiceImpl localExecutionService;
+    private final LocalExecutionService localExecutionService;
 
-    public EthereumTest(TestConfig config) {
-        SystemProperties.getDefault().setBlockchainConfig(new FrontierConfig(new FrontierConfig.FrontierConstants() {
+    public EthereumTest(TestConfig testConfig) {
+        SystemProperties.getDefault().setBlockchainConfig(new HomesteadConfig(new HomesteadConfig.HomesteadConstants() {
             @Override
             public BigInteger getMINIMUM_DIFFICULTY() {
                 return BigInteger.ONE;
@@ -37,15 +38,16 @@ public BigInteger getMINIMUM_DIFFICULTY() {
         }));
 
         this.blockchain = new StandaloneBlockchain();
+
         blockchain
-                .withGasLimit(config.getGasLimit())
-                .withGasPrice(config.getGasPrice())
-                .withCurrentTime(config.getInitialTime());
+                .withGasLimit(testConfig.getGasLimit())
+                .withGasPrice(testConfig.getGasPrice())
+                .withCurrentTime(testConfig.getInitialTime());
 
-        config.getBalances().entrySet()
+        testConfig.getBalances().entrySet()
                 .forEach(entry -> blockchain.withAccountBalance(entry.getKey().getAddress().address, entry.getValue().inWei()));
 
-        localExecutionService = new LocalExecutionServiceImpl(blockchain.getBlockchain(), ChainId.id(1));
+        localExecutionService = new LocalExecutionService(blockchain.getBlockchain(), ChainId.id(1));
         CompletableFuture.runAsync(() -> {
             try {
                 while(true) {
@@ -57,7 +59,7 @@ public BigInteger getMINIMUM_DIFFICULTY() {
             }
         });
 
-        this.config = config;
+        this.testConfig = testConfig;
     }
 
     public EthAccount defaultAccount() {
@@ -66,7 +68,7 @@ public EthAccount defaultAccount() {
 
     @Override
     public BigInteger getGasPrice() {
-        return BigInteger.valueOf(config.getGasPrice());
+        return BigInteger.valueOf(testConfig.getGasPrice());
     }
 
     @Override
diff --git a/src/main/java/org/adridadou/ethereum/blockchain/IncompatibleDatabaseBehavior.java b/src/main/java/org/adridadou/ethereum/ethj/IncompatibleDatabaseBehavior.java
similarity index 78%
rename from src/main/java/org/adridadou/ethereum/blockchain/IncompatibleDatabaseBehavior.java
rename to src/main/java/org/adridadou/ethereum/ethj/IncompatibleDatabaseBehavior.java
index f400a44..e087931 100644
--- a/src/main/java/org/adridadou/ethereum/blockchain/IncompatibleDatabaseBehavior.java
+++ b/src/main/java/org/adridadou/ethereum/ethj/IncompatibleDatabaseBehavior.java
@@ -1,4 +1,4 @@
-package org.adridadou.ethereum.blockchain;
+package org.adridadou.ethereum.ethj;
 
 /**
  * Created by davidroon on 26.12.16.
diff --git a/src/main/java/org/adridadou/ethereum/provider/LocalExecutionServiceImpl.java b/src/main/java/org/adridadou/ethereum/ethj/LocalExecutionService.java
similarity index 95%
rename from src/main/java/org/adridadou/ethereum/provider/LocalExecutionServiceImpl.java
rename to src/main/java/org/adridadou/ethereum/ethj/LocalExecutionService.java
index 9cd87e7..d4920da 100644
--- a/src/main/java/org/adridadou/ethereum/provider/LocalExecutionServiceImpl.java
+++ b/src/main/java/org/adridadou/ethereum/ethj/LocalExecutionService.java
@@ -1,4 +1,4 @@
-package org.adridadou.ethereum.provider;
+package org.adridadou.ethereum.ethj;
 
 import org.adridadou.ethereum.values.EthAccount;
 import org.adridadou.ethereum.values.EthAddress;
@@ -14,11 +14,11 @@
 /**
  * Created by davidroon on 30.01.17.
  */
-public class LocalExecutionServiceImpl {
+public class LocalExecutionService {
     private final BlockchainImpl blockchain;
     private final ChainId chainId;
 
-    public LocalExecutionServiceImpl(BlockchainImpl blockchain, ChainId chainId) {
+    public LocalExecutionService(BlockchainImpl blockchain, ChainId chainId) {
         this.blockchain = blockchain;
         this.chainId = chainId;
     }
diff --git a/src/main/java/org/adridadou/ethereum/blockchain/TestConfig.java b/src/main/java/org/adridadou/ethereum/ethj/TestConfig.java
similarity index 97%
rename from src/main/java/org/adridadou/ethereum/blockchain/TestConfig.java
rename to src/main/java/org/adridadou/ethereum/ethj/TestConfig.java
index 3dd4bc3..7bc0757 100644
--- a/src/main/java/org/adridadou/ethereum/blockchain/TestConfig.java
+++ b/src/main/java/org/adridadou/ethereum/ethj/TestConfig.java
@@ -1,4 +1,4 @@
-package org.adridadou.ethereum.blockchain;
+package org.adridadou.ethereum.ethj;
 
 import org.adridadou.ethereum.values.EthAccount;
 import org.adridadou.ethereum.values.EthValue;
diff --git a/src/main/java/org/adridadou/ethereum/provider/EthereumFacadeProvider.java b/src/main/java/org/adridadou/ethereum/ethj/provider/EthereumFacadeProvider.java
similarity index 91%
rename from src/main/java/org/adridadou/ethereum/provider/EthereumFacadeProvider.java
rename to src/main/java/org/adridadou/ethereum/ethj/provider/EthereumFacadeProvider.java
index 8e7b466..9a22e3a 100644
--- a/src/main/java/org/adridadou/ethereum/provider/EthereumFacadeProvider.java
+++ b/src/main/java/org/adridadou/ethereum/ethj/provider/EthereumFacadeProvider.java
@@ -1,10 +1,13 @@
-package org.adridadou.ethereum.provider;
+package org.adridadou.ethereum.ethj.provider;
 
 import com.typesafe.config.ConfigFactory;
-import org.adridadou.ethereum.EthereumFacade;
-import org.adridadou.ethereum.blockchain.*;
+import org.adridadou.ethereum.*;
 import org.adridadou.ethereum.converters.input.InputTypeHandler;
 import org.adridadou.ethereum.converters.output.OutputTypeHandler;
+import org.adridadou.ethereum.ethj.BlockchainConfig;
+import org.adridadou.ethereum.ethj.EthereumReal;
+import org.adridadou.ethereum.ethj.EthereumTest;
+import org.adridadou.ethereum.ethj.TestConfig;
 import org.adridadou.ethereum.event.EthereumEventHandler;
 import org.adridadou.ethereum.swarm.SwarmService;
 import org.adridadou.ethereum.values.config.ChainId;
diff --git a/src/main/java/org/adridadou/ethereum/provider/EthereumJConfigs.java b/src/main/java/org/adridadou/ethereum/ethj/provider/EthereumJConfigs.java
similarity index 91%
rename from src/main/java/org/adridadou/ethereum/provider/EthereumJConfigs.java
rename to src/main/java/org/adridadou/ethereum/ethj/provider/EthereumJConfigs.java
index bb3b33d..17c947c 100644
--- a/src/main/java/org/adridadou/ethereum/provider/EthereumJConfigs.java
+++ b/src/main/java/org/adridadou/ethereum/ethj/provider/EthereumJConfigs.java
@@ -1,7 +1,8 @@
-package org.adridadou.ethereum.provider;
+package org.adridadou.ethereum.ethj.provider;
 
-import org.adridadou.ethereum.blockchain.BlockchainConfig;
-import org.adridadou.ethereum.blockchain.IncompatibleDatabaseBehavior;
+import org.adridadou.ethereum.ethj.BlockchainConfig;
+import org.adridadou.ethereum.ethj.IncompatibleDatabaseBehavior;
+import org.adridadou.ethereum.ethj.provider.EthereumFacadeProvider;
 import org.adridadou.ethereum.values.config.*;
 
 /**
diff --git a/src/main/java/org/adridadou/ethereum/provider/PrivateEthereumFacadeProvider.java b/src/main/java/org/adridadou/ethereum/ethj/provider/PrivateEthereumFacadeProvider.java
similarity index 97%
rename from src/main/java/org/adridadou/ethereum/provider/PrivateEthereumFacadeProvider.java
rename to src/main/java/org/adridadou/ethereum/ethj/provider/PrivateEthereumFacadeProvider.java
index f916f60..7946bca 100644
--- a/src/main/java/org/adridadou/ethereum/provider/PrivateEthereumFacadeProvider.java
+++ b/src/main/java/org/adridadou/ethereum/ethj/provider/PrivateEthereumFacadeProvider.java
@@ -1,10 +1,10 @@
-package org.adridadou.ethereum.provider;
+package org.adridadou.ethereum.ethj.provider;
 
 import com.typesafe.config.ConfigFactory;
 import org.adridadou.ethereum.EthereumFacade;
-import org.adridadou.ethereum.blockchain.EthereumBackend;
-import org.adridadou.ethereum.blockchain.EthereumProxy;
-import org.adridadou.ethereum.blockchain.EthereumReal;
+import org.adridadou.ethereum.EthereumBackend;
+import org.adridadou.ethereum.EthereumProxy;
+import org.adridadou.ethereum.ethj.EthereumReal;
 import org.adridadou.ethereum.converters.input.InputTypeHandler;
 import org.adridadou.ethereum.converters.output.OutputTypeHandler;
 import org.adridadou.ethereum.event.EthereumEventHandler;
diff --git a/src/main/java/org/adridadou/ethereum/provider/PrivateNetworkConfig.java b/src/main/java/org/adridadou/ethereum/ethj/provider/PrivateNetworkConfig.java
similarity index 96%
rename from src/main/java/org/adridadou/ethereum/provider/PrivateNetworkConfig.java
rename to src/main/java/org/adridadou/ethereum/ethj/provider/PrivateNetworkConfig.java
index b0a1221..7b1e325 100644
--- a/src/main/java/org/adridadou/ethereum/provider/PrivateNetworkConfig.java
+++ b/src/main/java/org/adridadou/ethereum/ethj/provider/PrivateNetworkConfig.java
@@ -1,4 +1,4 @@
-package org.adridadou.ethereum.provider;
+package org.adridadou.ethereum.ethj.provider;
 
 import org.adridadou.ethereum.values.EthAccount;
 import org.adridadou.ethereum.values.EthValue;
diff --git a/src/main/java/org/adridadou/ethereum/event/EthereumEventHandler.java b/src/main/java/org/adridadou/ethereum/event/EthereumEventHandler.java
index b55e7c9..7df3f8e 100644
--- a/src/main/java/org/adridadou/ethereum/event/EthereumEventHandler.java
+++ b/src/main/java/org/adridadou/ethereum/event/EthereumEventHandler.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-import org.adridadou.ethereum.blockchain.EthereumBackend;
+import org.adridadou.ethereum.EthereumBackend;
 import org.adridadou.ethereum.values.EthData;
 import org.adridadou.exception.EthereumApiException;
 import org.ethereum.core.Block;
@@ -52,16 +52,16 @@ public void onPendingTransactionUpdate(TransactionReceipt txReceipt, PendingTran
         onTransactionHandler.on(new OnTransactionParameters(txReceipt, EthData.of(transaction.getHash()), transactionStatus, txReceipt.getError(), new ArrayList<>(), transaction.getSender(), transaction.getReceiveAddress()));
     }
 
-  @Override
-  public void onTransactionExecuted(TransactionExecutionSummary summary) {
+    @Override
+    public void onTransactionExecuted(TransactionExecutionSummary summary) {
       summary.getInternalTransactions()
               .forEach(internalTransaction -> onTransactionHandler
                       .on(new OnTransactionParameters(null, EthData.of(internalTransaction.getHash()), TransactionStatus.Executed, "", summary.getLogs(), internalTransaction.getSender(), internalTransaction.getReceiveAddress())));
       Transaction transaction = summary.getTransaction();
       onTransactionHandler.on(new OnTransactionParameters(null, EthData.of(transaction.getHash()), TransactionStatus.Executed, "", summary.getLogs(), transaction.getSender(), transaction.getReceiveAddress()));
-  }
+    }
 
-  public TransactionReceipt checkForErrors(final TransactionReceipt receipt) {
+    public TransactionReceipt checkForErrors(final TransactionReceipt receipt) {
         if (receipt.isSuccessful() && receipt.isValid()) {
             return receipt;
         } else {
diff --git a/src/main/java/org/adridadou/ethereum/blockchain/EthereumRPC.java b/src/main/java/org/adridadou/ethereum/rpc/EthereumRPC.java
similarity index 96%
rename from src/main/java/org/adridadou/ethereum/blockchain/EthereumRPC.java
rename to src/main/java/org/adridadou/ethereum/rpc/EthereumRPC.java
index 67827e9..3ab0fa4 100644
--- a/src/main/java/org/adridadou/ethereum/blockchain/EthereumRPC.java
+++ b/src/main/java/org/adridadou/ethereum/rpc/EthereumRPC.java
@@ -1,5 +1,6 @@
-package org.adridadou.ethereum.blockchain;
+package org.adridadou.ethereum.rpc;
 
+import org.adridadou.ethereum.EthereumBackend;
 import org.adridadou.ethereum.event.EthereumEventHandler;
 import org.adridadou.ethereum.values.*;
 import org.ethereum.core.Transaction;
diff --git a/src/main/java/org/adridadou/ethereum/blockchain/EthereumRpcEventGenerator.java b/src/main/java/org/adridadou/ethereum/rpc/EthereumRpcEventGenerator.java
similarity index 91%
rename from src/main/java/org/adridadou/ethereum/blockchain/EthereumRpcEventGenerator.java
rename to src/main/java/org/adridadou/ethereum/rpc/EthereumRpcEventGenerator.java
index 8172a2a..4cd4ee4 100644
--- a/src/main/java/org/adridadou/ethereum/blockchain/EthereumRpcEventGenerator.java
+++ b/src/main/java/org/adridadou/ethereum/rpc/EthereumRpcEventGenerator.java
@@ -1,4 +1,4 @@
-package org.adridadou.ethereum.blockchain;
+package org.adridadou.ethereum.rpc;
 
 import org.adridadou.ethereum.event.EthereumEventHandler;
 import org.ethereum.listener.EthereumListener;
diff --git a/src/main/java/org/adridadou/ethereum/blockchain/Web3JFacade.java b/src/main/java/org/adridadou/ethereum/rpc/Web3JFacade.java
similarity index 99%
rename from src/main/java/org/adridadou/ethereum/blockchain/Web3JFacade.java
rename to src/main/java/org/adridadou/ethereum/rpc/Web3JFacade.java
index 8e64ef0..ac69b04 100644
--- a/src/main/java/org/adridadou/ethereum/blockchain/Web3JFacade.java
+++ b/src/main/java/org/adridadou/ethereum/rpc/Web3JFacade.java
@@ -1,4 +1,4 @@
-package org.adridadou.ethereum.blockchain;
+package org.adridadou.ethereum.rpc;
 
 import org.adridadou.ethereum.converters.output.OutputTypeHandler;
 import org.adridadou.ethereum.values.*;
diff --git a/src/main/java/org/adridadou/ethereum/provider/EthereumFacadeRpcProvider.java b/src/main/java/org/adridadou/ethereum/rpc/provider/EthereumFacadeRpcProvider.java
similarity index 83%
rename from src/main/java/org/adridadou/ethereum/provider/EthereumFacadeRpcProvider.java
rename to src/main/java/org/adridadou/ethereum/rpc/provider/EthereumFacadeRpcProvider.java
index bb0d9e4..292fe9b 100644
--- a/src/main/java/org/adridadou/ethereum/provider/EthereumFacadeRpcProvider.java
+++ b/src/main/java/org/adridadou/ethereum/rpc/provider/EthereumFacadeRpcProvider.java
@@ -1,10 +1,10 @@
-package org.adridadou.ethereum.provider;
+package org.adridadou.ethereum.rpc.provider;
 
 import org.adridadou.ethereum.EthereumFacade;
-import org.adridadou.ethereum.blockchain.EthereumRPC;
-import org.adridadou.ethereum.blockchain.EthereumProxy;
-import org.adridadou.ethereum.blockchain.EthereumRpcEventGenerator;
-import org.adridadou.ethereum.blockchain.Web3JFacade;
+import org.adridadou.ethereum.rpc.EthereumRPC;
+import org.adridadou.ethereum.EthereumProxy;
+import org.adridadou.ethereum.rpc.EthereumRpcEventGenerator;
+import org.adridadou.ethereum.rpc.Web3JFacade;
 import org.adridadou.ethereum.converters.input.InputTypeHandler;
 import org.adridadou.ethereum.converters.output.OutputTypeHandler;
 import org.adridadou.ethereum.event.EthereumEventHandler;
diff --git a/src/main/java/org/adridadou/ethereum/provider/InfuraMainEthereumFacadeProvider.java b/src/main/java/org/adridadou/ethereum/rpc/provider/InfuraMainEthereumFacadeProvider.java
similarity index 79%
rename from src/main/java/org/adridadou/ethereum/provider/InfuraMainEthereumFacadeProvider.java
rename to src/main/java/org/adridadou/ethereum/rpc/provider/InfuraMainEthereumFacadeProvider.java
index 6541afe..4429019 100644
--- a/src/main/java/org/adridadou/ethereum/provider/InfuraMainEthereumFacadeProvider.java
+++ b/src/main/java/org/adridadou/ethereum/rpc/provider/InfuraMainEthereumFacadeProvider.java
@@ -1,6 +1,7 @@
-package org.adridadou.ethereum.provider;
+package org.adridadou.ethereum.rpc.provider;
 
 import org.adridadou.ethereum.EthereumFacade;
+import org.adridadou.ethereum.ethj.provider.EthereumFacadeProvider;
 import org.adridadou.ethereum.values.config.InfuraKey;
 
 /**
diff --git a/src/main/java/org/adridadou/ethereum/provider/InfuraRopstenEthereumFacadeProvider.java b/src/main/java/org/adridadou/ethereum/rpc/provider/InfuraRopstenEthereumFacadeProvider.java
similarity index 79%
rename from src/main/java/org/adridadou/ethereum/provider/InfuraRopstenEthereumFacadeProvider.java
rename to src/main/java/org/adridadou/ethereum/rpc/provider/InfuraRopstenEthereumFacadeProvider.java
index d069491..24a3f6a 100644
--- a/src/main/java/org/adridadou/ethereum/provider/InfuraRopstenEthereumFacadeProvider.java
+++ b/src/main/java/org/adridadou/ethereum/rpc/provider/InfuraRopstenEthereumFacadeProvider.java
@@ -1,6 +1,7 @@
-package org.adridadou.ethereum.provider;
+package org.adridadou.ethereum.rpc.provider;
 
 import org.adridadou.ethereum.EthereumFacade;
+import org.adridadou.ethereum.ethj.provider.EthereumFacadeProvider;
 import org.adridadou.ethereum.values.config.*;
 
 /**
diff --git a/src/main/java/org/adridadou/ethereum/values/Payable.java b/src/main/java/org/adridadou/ethereum/values/Payable.java
index 41337b5..0c6704a 100644
--- a/src/main/java/org/adridadou/ethereum/values/Payable.java
+++ b/src/main/java/org/adridadou/ethereum/values/Payable.java
@@ -1,7 +1,7 @@
 package org.adridadou.ethereum.values;
 
 import org.adridadou.ethereum.EthereumContractInvocationHandler;
-import org.adridadou.ethereum.smartcontract.SmartContract;
+import org.adridadou.ethereum.SmartContract;
 
 import java.lang.reflect.Method;
 import java.util.concurrent.CompletableFuture;
diff --git a/src/test/java/org/adridadou/EthereumProviderTest.java b/src/test/java/org/adridadou/EthereumProviderTest.java
index f29c405..3f8feac 100644
--- a/src/test/java/org/adridadou/EthereumProviderTest.java
+++ b/src/test/java/org/adridadou/EthereumProviderTest.java
@@ -1,9 +1,9 @@
 package org.adridadou;
 
 import org.adridadou.ethereum.*;
-import org.adridadou.ethereum.blockchain.EthereumProxy;
-import org.adridadou.ethereum.blockchain.EthereumTest;
-import org.adridadou.ethereum.blockchain.TestConfig;
+import org.adridadou.ethereum.EthereumProxy;
+import org.adridadou.ethereum.ethj.EthereumTest;
+import org.adridadou.ethereum.ethj.TestConfig;
 import org.adridadou.ethereum.converters.input.InputTypeHandler;
 import org.adridadou.ethereum.converters.output.OutputTypeHandler;
 import org.adridadou.ethereum.event.EthereumEventHandler;
diff --git a/src/test/java/org/adridadou/EventsTest.java b/src/test/java/org/adridadou/EventsTest.java
index 0645ec2..9b28c6b 100644
--- a/src/test/java/org/adridadou/EventsTest.java
+++ b/src/test/java/org/adridadou/EventsTest.java
@@ -1,9 +1,9 @@
 package org.adridadou;
 
 import org.adridadou.ethereum.EthereumFacade;
-import org.adridadou.ethereum.blockchain.TestConfig;
+import org.adridadou.ethereum.ethj.TestConfig;
 import org.adridadou.ethereum.keystore.AccountProvider;
-import org.adridadou.ethereum.provider.EthereumFacadeProvider;
+import org.adridadou.ethereum.ethj.provider.EthereumFacadeProvider;
 import org.adridadou.ethereum.values.CompiledContract;
 import org.adridadou.ethereum.values.EthAccount;
 import org.adridadou.ethereum.values.EthAddress;
diff --git a/src/test/java/org/adridadou/TestnetConnectionTest.java b/src/test/java/org/adridadou/TestnetConnectionTest.java
index f94cf15..7350f3f 100644
--- a/src/test/java/org/adridadou/TestnetConnectionTest.java
+++ b/src/test/java/org/adridadou/TestnetConnectionTest.java
@@ -1,13 +1,14 @@
 package org.adridadou;
 
 import org.adridadou.ethereum.*;
-import org.adridadou.ethereum.blockchain.TestConfig;
+import org.adridadou.ethereum.ethj.TestConfig;
+import org.adridadou.ethereum.ethj.provider.EthereumFacadeProvider;
+import org.adridadou.ethereum.ethj.provider.PrivateEthereumFacadeProvider;
 import org.adridadou.ethereum.keystore.AccountProvider;
-import org.adridadou.ethereum.provider.*;
 import org.adridadou.ethereum.values.*;
 
-import static org.adridadou.ethereum.provider.EthereumJConfigs.ropsten;
-import static org.adridadou.ethereum.provider.PrivateNetworkConfig.config;
+import static org.adridadou.ethereum.ethj.provider.EthereumJConfigs.ropsten;
+import static org.adridadou.ethereum.ethj.provider.PrivateNetworkConfig.config;
 import static org.adridadou.ethereum.values.EthValue.ether;
 import static org.junit.Assert.*;
 
@@ -98,7 +99,7 @@ private void testMethodCalls(MyContract2 myContract, EthAddress address, Ethereu
 
     @Test
     public void main_example_how_the_lib_works() throws Exception {
-        final EthereumFacade ethereum = fromPrivateNetwork();
+        final EthereumFacade ethereum = fromTest();
         EthAddress address = publishAndMapContract(ethereum);
         CompiledContract compiledContract = ethereum.compile(contractSource, "myContract2").get();
         MyContract2 myContract = ethereum.createContractProxy(compiledContract, address, mainAccount, MyContract2.class);
diff --git a/src/test/java/org/adridadou/ethereum/EthereumFacadeTest.java b/src/test/java/org/adridadou/ethereum/EthereumFacadeTest.java
index a4edf2d..dcec4a7 100644
--- a/src/test/java/org/adridadou/ethereum/EthereumFacadeTest.java
+++ b/src/test/java/org/adridadou/ethereum/EthereumFacadeTest.java
@@ -1,10 +1,9 @@
 package org.adridadou.ethereum;
 
-import org.adridadou.ethereum.blockchain.EthereumProxy;
-import org.adridadou.ethereum.blockchain.EthereumTest;
-import org.adridadou.ethereum.blockchain.TestConfig;
 import org.adridadou.ethereum.converters.input.InputTypeHandler;
 import org.adridadou.ethereum.converters.output.OutputTypeHandler;
+import org.adridadou.ethereum.ethj.EthereumTest;
+import org.adridadou.ethereum.ethj.TestConfig;
 import org.adridadou.ethereum.event.EthereumEventHandler;
 import org.adridadou.ethereum.swarm.SwarmService;
 import org.adridadou.ethereum.values.CompiledContract;
diff --git a/src/test/java/org/adridadou/ethereum/RpcEthereumTest.java b/src/test/java/org/adridadou/ethereum/RpcEthereumTest.java
index ae1259d..e549996 100644
--- a/src/test/java/org/adridadou/ethereum/RpcEthereumTest.java
+++ b/src/test/java/org/adridadou/ethereum/RpcEthereumTest.java
@@ -1,10 +1,10 @@
 package org.adridadou.ethereum;
 
 
-import org.adridadou.ethereum.blockchain.Web3JFacade;
 import org.adridadou.ethereum.converters.output.OutputTypeHandler;
-import org.adridadou.ethereum.provider.EthereumFacadeProvider;
-import org.adridadou.ethereum.provider.EthereumFacadeRpcProvider;
+import org.adridadou.ethereum.ethj.provider.EthereumFacadeProvider;
+import org.adridadou.ethereum.rpc.provider.EthereumFacadeRpcProvider;
+import org.adridadou.ethereum.rpc.Web3JFacade;
 import org.adridadou.ethereum.values.*;
 import org.ethereum.crypto.ECKey;
 import org.junit.Test;
diff --git a/src/test/java/org/adridadou/ethereum/blockchain/Web3FacadeTest.java b/src/test/java/org/adridadou/ethereum/blockchain/Web3FacadeTest.java
index 3e126bc..da2198a 100644
--- a/src/test/java/org/adridadou/ethereum/blockchain/Web3FacadeTest.java
+++ b/src/test/java/org/adridadou/ethereum/blockchain/Web3FacadeTest.java
@@ -1,5 +1,6 @@
 package org.adridadou.ethereum.blockchain;
 
+import org.adridadou.ethereum.rpc.Web3JFacade;
 import org.adridadou.ethereum.converters.output.OutputTypeHandler;
 import org.adridadou.ethereum.values.EthAddress;
 import org.adridadou.ethereum.values.config.ChainId;