diff --git a/build.gradle b/build.gradle
index 7b73eac..5556e20 100644
--- a/build.gradle
+++ b/build.gradle
@@ -104,13 +104,13 @@ if (rootProject.name != AION_PROJECT_NAME) {
 
 dependencies {
     if (rootProject.name == AION_PROJECT_NAME) {
-        compile project(':modAionBase')
+        compile project(':type_api')
         compile project(':modCrypto')
         compile project(':modLogger')
         compile project(':modRlp')
         compile project(':3rdParty/libnzmq')
     } else {
-        compile files("./mod/modAionBase.jar")
+        compile files("./mod/type_api.jar")
         compile files("./mod/modCrypto.jar")
         compile files("./mod/modLogger.jar")
         compile files("./mod/modRlp.jar")
@@ -296,7 +296,7 @@ task updateAionDeps(type: Copy) {
     }
 
     // note: dependencies of the projects aren't copied
-    ['modAionBase', 'modCrypto', 'modLogger', 'modRlp'].each {
+    ['type_api', 'modCrypto', 'modLogger', 'modRlp'].each {
         def maybeProj = rootProject.findProject(":${it}")
         if (maybeProj != null) {
             dependsOn maybeProj.jar
diff --git a/src/module-info.java b/src/module-info.java
index 0040707..4631d10 100644
--- a/src/module-info.java
+++ b/src/module-info.java
@@ -1,5 +1,5 @@
 module aion.api.client {
-    requires aion.base;
+    requires aion.type.api;
     requires aion.log;
     requires java.xml;
     requires slf4j.api;
diff --git a/src/org/aion/api/IAdmin.java b/src/org/aion/api/IAdmin.java
index 6e378d4..76db5a4 100644
--- a/src/org/aion/api/IAdmin.java
+++ b/src/org/aion/api/IAdmin.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 import org.aion.api.type.ApiMsg;
-import org.aion.base.type.Hash256;
+import org.aion.type.api.type.Hash256;
 import org.aion.vm.api.interfaces.Address;
 
 /**
diff --git a/src/org/aion/api/IChain.java b/src/org/aion/api/IChain.java
index 67fdf84..958c2e3 100644
--- a/src/org/aion/api/IChain.java
+++ b/src/org/aion/api/IChain.java
@@ -4,7 +4,7 @@
 import org.aion.api.type.ApiMsg;
 import org.aion.api.type.Block;
 import org.aion.api.type.Transaction;
-import org.aion.base.type.Hash256;
+import org.aion.type.api.type.Hash256;
 import org.aion.vm.api.interfaces.Address;
 
 /**
diff --git a/src/org/aion/api/IContract.java b/src/org/aion/api/IContract.java
index 54169aa..8d11cdb 100644
--- a/src/org/aion/api/IContract.java
+++ b/src/org/aion/api/IContract.java
@@ -9,8 +9,8 @@
 import org.aion.api.type.ContractResponse;
 import org.aion.api.type.JsonFmt;
 import org.aion.api.type.TxArgs;
-import org.aion.base.type.Hash256;
-import org.aion.base.util.ByteArrayWrapper;
+import org.aion.type.api.type.Hash256;
+import org.aion.type.api.util.ByteArrayWrapper;
 import org.aion.vm.api.interfaces.Address;
 
 /**
diff --git a/src/org/aion/api/ITx.java b/src/org/aion/api/ITx.java
index 19df82b..be508da 100644
--- a/src/org/aion/api/ITx.java
+++ b/src/org/aion/api/ITx.java
@@ -10,8 +10,8 @@
 import org.aion.api.type.MsgRsp;
 import org.aion.api.type.TxArgs;
 import org.aion.api.type.TxReceipt;
-import org.aion.base.type.Hash256;
-import org.aion.base.util.ByteArrayWrapper;
+import org.aion.type.api.type.Hash256;
+import org.aion.type.api.util.ByteArrayWrapper;
 import org.aion.vm.api.interfaces.Address;
 
 /**
diff --git a/src/org/aion/api/impl/Account.java b/src/org/aion/api/impl/Account.java
index 8586dbd..2cc8156 100644
--- a/src/org/aion/api/impl/Account.java
+++ b/src/org/aion/api/impl/Account.java
@@ -34,8 +34,8 @@
 import org.aion.api.type.Key;
 import org.aion.api.type.KeyExport;
 import org.aion.api.type.core.account.KeystoreFormat;
-import org.aion.base.util.ByteUtil;
-import org.aion.base.util.TypeConverter;
+import org.aion.type.api.util.ByteUtil;
+import org.aion.type.api.util.TypeConverter;
 import org.aion.crypto.ECKey;
 import org.aion.crypto.ECKeyFac;
 import org.aion.vm.api.interfaces.Address;
diff --git a/src/org/aion/api/impl/Admin.java b/src/org/aion/api/impl/Admin.java
index 4ff804e..3cf3fcd 100644
--- a/src/org/aion/api/impl/Admin.java
+++ b/src/org/aion/api/impl/Admin.java
@@ -24,9 +24,9 @@
 import org.aion.api.type.Block;
 import org.aion.api.type.BlockDetails;
 import org.aion.api.type.BlockSql;
-import org.aion.base.type.AionAddress;
-import org.aion.base.type.Hash256;
-import org.aion.base.util.ByteUtil;
+import org.aion.type.api.type.AionAddress;
+import org.aion.type.api.type.Hash256;
+import org.aion.type.api.util.ByteUtil;
 import org.aion.vm.api.interfaces.Address;
 import org.slf4j.Logger;
 
diff --git a/src/org/aion/api/impl/ApiBase.java b/src/org/aion/api/impl/ApiBase.java
index e6942e4..75d44fe 100644
--- a/src/org/aion/api/impl/ApiBase.java
+++ b/src/org/aion/api/impl/ApiBase.java
@@ -13,8 +13,8 @@
 import org.aion.api.type.ApiMsg;
 import org.aion.api.type.Event;
 import org.aion.api.type.MsgRsp;
-import org.aion.base.type.AionAddress;
-import org.aion.base.util.ByteArrayWrapper;
+import org.aion.type.api.type.AionAddress;
+import org.aion.type.api.util.ByteArrayWrapper;
 import org.aion.vm.api.interfaces.Address;
 import org.slf4j.Logger;
 import org.zeromq.ZMQ;
diff --git a/src/org/aion/api/impl/Chain.java b/src/org/aion/api/impl/Chain.java
index b32af82..3dd016d 100644
--- a/src/org/aion/api/impl/Chain.java
+++ b/src/org/aion/api/impl/Chain.java
@@ -15,10 +15,10 @@
 import org.aion.api.type.ApiMsg;
 import org.aion.api.type.ApiMsg.cast;
 import org.aion.api.type.Block;
-import org.aion.base.type.AionAddress;
-import org.aion.base.type.Hash256;
-import org.aion.base.util.ByteArrayWrapper;
-import org.aion.base.util.ByteUtil;
+import org.aion.type.api.type.AionAddress;
+import org.aion.type.api.type.Hash256;
+import org.aion.type.api.util.ByteArrayWrapper;
+import org.aion.type.api.util.ByteUtil;
 import org.aion.vm.api.interfaces.Address;
 import org.slf4j.Logger;
 
diff --git a/src/org/aion/api/impl/Contract.java b/src/org/aion/api/impl/Contract.java
index 50311c9..20c175c 100644
--- a/src/org/aion/api/impl/Contract.java
+++ b/src/org/aion/api/impl/Contract.java
@@ -38,9 +38,9 @@
 import org.aion.api.type.JsonFmt;
 import org.aion.api.type.MsgRsp;
 import org.aion.api.type.TxArgs;
-import org.aion.base.type.AionAddress;
-import org.aion.base.type.Hash256;
-import org.aion.base.util.ByteArrayWrapper;
+import org.aion.type.api.type.AionAddress;
+import org.aion.type.api.type.Hash256;
+import org.aion.type.api.util.ByteArrayWrapper;
 import org.aion.vm.api.interfaces.Address;
 import org.apache.commons.collections4.map.LRUMap;
 import org.slf4j.Logger;
diff --git a/src/org/aion/api/impl/ContractController.java b/src/org/aion/api/impl/ContractController.java
index a4ce635..551fdb9 100644
--- a/src/org/aion/api/impl/ContractController.java
+++ b/src/org/aion/api/impl/ContractController.java
@@ -25,8 +25,8 @@
 import org.aion.api.type.ContractDeploy;
 import org.aion.api.type.DeployResponse;
 import org.aion.api.type.JsonFmt;
-import org.aion.base.type.Hash256;
-import org.aion.base.util.ByteArrayWrapper;
+import org.aion.type.api.type.Hash256;
+import org.aion.type.api.util.ByteArrayWrapper;
 import org.aion.vm.api.interfaces.Address;
 import org.slf4j.Logger;
 
diff --git a/src/org/aion/api/impl/MsgExecutor.java b/src/org/aion/api/impl/MsgExecutor.java
index 4fc24cc..9d9a40e 100644
--- a/src/org/aion/api/impl/MsgExecutor.java
+++ b/src/org/aion/api/impl/MsgExecutor.java
@@ -34,11 +34,11 @@
 import org.aion.api.type.ContractEvent;
 import org.aion.api.type.Event;
 import org.aion.api.type.MsgRsp;
-import org.aion.base.type.AionAddress;
-import org.aion.base.type.Hash256;
-import org.aion.base.util.ByteArrayWrapper;
-import org.aion.base.util.ByteUtil;
-import org.aion.base.util.NativeLoader;
+import org.aion.type.api.type.AionAddress;
+import org.aion.type.api.type.Hash256;
+import org.aion.type.api.util.ByteArrayWrapper;
+import org.aion.type.api.util.ByteUtil;
+import org.aion.type.api.util.NativeLoader;
 import org.apache.commons.collections4.map.LRUMap;
 import org.slf4j.Logger;
 import org.zeromq.ZMQ;
diff --git a/src/org/aion/api/impl/Tx.java b/src/org/aion/api/impl/Tx.java
index 0e00ed2..c1b1f7d 100644
--- a/src/org/aion/api/impl/Tx.java
+++ b/src/org/aion/api/impl/Tx.java
@@ -31,11 +31,11 @@
 import org.aion.api.type.TxArgs;
 import org.aion.api.type.TxArgs.TxArgsBuilder;
 import org.aion.api.type.core.tx.AionTransaction;
-import org.aion.base.type.AionAddress;
-import org.aion.base.type.Hash256;
-import org.aion.base.util.ByteArrayWrapper;
-import org.aion.base.util.ByteUtil;
-import org.aion.base.util.Hex;
+import org.aion.type.api.type.AionAddress;
+import org.aion.type.api.type.Hash256;
+import org.aion.type.api.util.ByteArrayWrapper;
+import org.aion.type.api.util.ByteUtil;
+import org.aion.type.api.util.Hex;
 import org.aion.crypto.ECKey;
 import org.aion.crypto.ECKeyFac;
 import org.aion.vm.api.interfaces.Address;
diff --git a/src/org/aion/api/impl/Wallet.java b/src/org/aion/api/impl/Wallet.java
index 5ada523..e924d38 100644
--- a/src/org/aion/api/impl/Wallet.java
+++ b/src/org/aion/api/impl/Wallet.java
@@ -10,8 +10,8 @@
 import org.aion.api.log.AionLoggerFactory;
 import org.aion.api.log.LogEnum;
 import org.aion.api.type.ApiMsg;
-import org.aion.base.type.AionAddress;
-import org.aion.base.util.ByteUtil;
+import org.aion.type.api.type.AionAddress;
+import org.aion.type.api.util.ByteUtil;
 import org.aion.vm.api.interfaces.Address;
 import org.slf4j.Logger;
 
diff --git a/src/org/aion/api/impl/internal/ApiUtils.java b/src/org/aion/api/impl/internal/ApiUtils.java
index 6aae8a3..8f10655 100644
--- a/src/org/aion/api/impl/internal/ApiUtils.java
+++ b/src/org/aion/api/impl/internal/ApiUtils.java
@@ -25,10 +25,10 @@
 import org.aion.api.type.TxDetails;
 import org.aion.api.type.TxLog;
 import org.aion.api.type.TxReceipt;
-import org.aion.base.type.AionAddress;
-import org.aion.base.type.Hash256;
-import org.aion.base.util.ByteArrayWrapper;
-import org.aion.base.util.ByteUtil;
+import org.aion.type.api.type.AionAddress;
+import org.aion.type.api.type.Hash256;
+import org.aion.type.api.util.ByteArrayWrapper;
+import org.aion.type.api.util.ByteUtil;
 import org.aion.vm.api.interfaces.Address;
 
 public class ApiUtils {
diff --git a/src/org/aion/api/sol/ISolidityArg.java b/src/org/aion/api/sol/ISolidityArg.java
index fa90c21..9fe4dad 100644
--- a/src/org/aion/api/sol/ISolidityArg.java
+++ b/src/org/aion/api/sol/ISolidityArg.java
@@ -1,7 +1,7 @@
 package org.aion.api.sol;
 
 import java.util.List;
-import org.aion.base.util.ByteArrayWrapper;
+import org.aion.type.api.util.ByteArrayWrapper;
 import org.aion.vm.api.interfaces.Address;
 
 /**
diff --git a/src/org/aion/api/sol/impl/SolidityAbstractType.java b/src/org/aion/api/sol/impl/SolidityAbstractType.java
index 166dc71..538d98c 100644
--- a/src/org/aion/api/sol/impl/SolidityAbstractType.java
+++ b/src/org/aion/api/sol/impl/SolidityAbstractType.java
@@ -9,7 +9,7 @@
 import org.aion.api.log.AionLoggerFactory;
 import org.aion.api.log.LogEnum;
 import org.aion.api.type.TxArgs;
-import org.aion.base.util.ByteArrayWrapper;
+import org.aion.type.api.util.ByteArrayWrapper;
 import org.slf4j.Logger;
 
 /**
diff --git a/src/org/aion/api/tools/Erc20Demo.java b/src/org/aion/api/tools/Erc20Demo.java
index 9a84bf5..e1c9f6d 100644
--- a/src/org/aion/api/tools/Erc20Demo.java
+++ b/src/org/aion/api/tools/Erc20Demo.java
@@ -21,7 +21,7 @@
 import org.aion.api.type.ApiMsg;
 import org.aion.api.type.ContractEvent;
 import org.aion.api.type.ContractResponse;
-import org.aion.base.type.AionAddress;
+import org.aion.type.api.type.AionAddress;
 import org.aion.vm.api.interfaces.Address;
 
 /** Created by Jay Tseng on 26/06/17. */
diff --git a/src/org/aion/api/tools/PerfBench.java b/src/org/aion/api/tools/PerfBench.java
index ba5a9f0..32b9b07 100644
--- a/src/org/aion/api/tools/PerfBench.java
+++ b/src/org/aion/api/tools/PerfBench.java
@@ -27,7 +27,7 @@
 import org.aion.api.type.ApiMsg;
 import org.aion.api.type.ContractResponse;
 import org.aion.api.type.MsgRsp;
-import org.aion.base.util.ByteArrayWrapper;
+import org.aion.type.api.util.ByteArrayWrapper;
 import org.aion.vm.api.interfaces.Address;
 
 /*
diff --git a/src/org/aion/api/type/Block.java b/src/org/aion/api/type/Block.java
index caa2f64..8b684a5 100644
--- a/src/org/aion/api/type/Block.java
+++ b/src/org/aion/api/type/Block.java
@@ -2,8 +2,8 @@
 
 import java.math.BigInteger;
 import java.util.List;
-import org.aion.base.type.Hash256;
-import org.aion.base.util.ByteArrayWrapper;
+import org.aion.type.api.type.Hash256;
+import org.aion.type.api.util.ByteArrayWrapper;
 import org.aion.vm.api.interfaces.Address;
 
 /**
diff --git a/src/org/aion/api/type/BlockDetails.java b/src/org/aion/api/type/BlockDetails.java
index 1d8d1c2..f5e9c41 100644
--- a/src/org/aion/api/type/BlockDetails.java
+++ b/src/org/aion/api/type/BlockDetails.java
@@ -2,8 +2,8 @@
 
 import java.math.BigInteger;
 import java.util.List;
-import org.aion.base.type.Hash256;
-import org.aion.base.util.ByteArrayWrapper;
+import org.aion.type.api.type.Hash256;
+import org.aion.type.api.util.ByteArrayWrapper;
 import org.aion.vm.api.interfaces.Address;
 
 /**
diff --git a/src/org/aion/api/type/ContractDeploy.java b/src/org/aion/api/type/ContractDeploy.java
index 48e44a8..8ca3c5e 100644
--- a/src/org/aion/api/type/ContractDeploy.java
+++ b/src/org/aion/api/type/ContractDeploy.java
@@ -2,8 +2,8 @@
 
 import java.math.BigInteger;
 import org.aion.api.ITx;
-import org.aion.base.util.ByteArrayWrapper;
-import org.aion.base.util.Bytesable;
+import org.aion.type.api.util.ByteArrayWrapper;
+import org.aion.type.api.util.Bytesable;
 import org.aion.vm.api.interfaces.Address;
 
 /**
diff --git a/src/org/aion/api/type/ContractEvent.java b/src/org/aion/api/type/ContractEvent.java
index cbca409..b292242 100644
--- a/src/org/aion/api/type/ContractEvent.java
+++ b/src/org/aion/api/type/ContractEvent.java
@@ -1,8 +1,8 @@
 package org.aion.api.type;
 
 import java.util.List;
-import org.aion.base.type.Hash256;
-import org.aion.base.util.ByteArrayWrapper;
+import org.aion.type.api.type.Hash256;
+import org.aion.type.api.util.ByteArrayWrapper;
 import org.aion.vm.api.interfaces.Address;
 
 /**
diff --git a/src/org/aion/api/type/ContractResponse.java b/src/org/aion/api/type/ContractResponse.java
index 7dbffa3..bce5c07 100644
--- a/src/org/aion/api/type/ContractResponse.java
+++ b/src/org/aion/api/type/ContractResponse.java
@@ -3,8 +3,8 @@
 import java.util.List;
 import org.aion.api.impl.internal.ApiUtils;
 import org.aion.api.impl.internal.Message;
-import org.aion.base.type.Hash256;
-import org.aion.base.util.ByteArrayWrapper;
+import org.aion.type.api.type.Hash256;
+import org.aion.type.api.util.ByteArrayWrapper;
 
 /**
  * ALl relevant information pertaining to {@link org.aion.api.IContract IContract} function calls.
diff --git a/src/org/aion/api/type/DeployResponse.java b/src/org/aion/api/type/DeployResponse.java
index c46687c..13993a7 100644
--- a/src/org/aion/api/type/DeployResponse.java
+++ b/src/org/aion/api/type/DeployResponse.java
@@ -1,6 +1,6 @@
 package org.aion.api.type;
 
-import org.aion.base.type.Hash256;
+import org.aion.type.api.type.Hash256;
 import org.aion.vm.api.interfaces.Address;
 
 /**
diff --git a/src/org/aion/api/type/Key.java b/src/org/aion/api/type/Key.java
index 68db706..257dd0a 100644
--- a/src/org/aion/api/type/Key.java
+++ b/src/org/aion/api/type/Key.java
@@ -1,6 +1,6 @@
 package org.aion.api.type;
 
-import org.aion.base.util.ByteArrayWrapper;
+import org.aion.type.api.util.ByteArrayWrapper;
 import org.aion.vm.api.interfaces.Address;
 
 /**
diff --git a/src/org/aion/api/type/KeyExport.java b/src/org/aion/api/type/KeyExport.java
index f41f51f..60f0d41 100644
--- a/src/org/aion/api/type/KeyExport.java
+++ b/src/org/aion/api/type/KeyExport.java
@@ -1,7 +1,7 @@
 package org.aion.api.type;
 
 import java.util.List;
-import org.aion.base.util.ByteArrayWrapper;
+import org.aion.type.api.util.ByteArrayWrapper;
 import org.aion.vm.api.interfaces.Address;
 
 /**
diff --git a/src/org/aion/api/type/MsgRsp.java b/src/org/aion/api/type/MsgRsp.java
index da2916e..99b8dfb 100644
--- a/src/org/aion/api/type/MsgRsp.java
+++ b/src/org/aion/api/type/MsgRsp.java
@@ -1,7 +1,7 @@
 package org.aion.api.type;
 
-import org.aion.base.type.Hash256;
-import org.aion.base.util.ByteArrayWrapper;
+import org.aion.type.api.type.Hash256;
+import org.aion.type.api.util.ByteArrayWrapper;
 
 /**
  * Represents the transaction status including the execution status and the API session hash.
@@ -21,8 +21,8 @@
  *      the class {@link ByteArrayWrapper ByteArrayWrapper} represent the deploy result if it is a contract deploy.
  *
  * @see org.aion.api.ITx#sendTransaction(org.aion.api.type.TxArgs)
- * @see org.aion.api.ITx#sendRawTransaction(org.aion.base.util.ByteArrayWrapper)
- * @see org.aion.api.ITx#sendSignedTransaction(org.aion.api.type.TxArgs, org.aion.base.util.ByteArrayWrapper)
+ * @see org.aion.api.ITx#sendRawTransaction(ByteArrayWrapper)
+ * @see org.aion.api.ITx#sendSignedTransaction(org.aion.api.type.TxArgs, ByteArrayWrapper)
  *
  * </pre>
  *
diff --git a/src/org/aion/api/type/Transaction.java b/src/org/aion/api/type/Transaction.java
index 24f8e79..100a752 100644
--- a/src/org/aion/api/type/Transaction.java
+++ b/src/org/aion/api/type/Transaction.java
@@ -1,19 +1,19 @@
 package org.aion.api.type;
 
 import java.math.BigInteger;
-import org.aion.base.type.Hash256;
-import org.aion.base.util.ByteArrayWrapper;
+import org.aion.type.api.type.Hash256;
+import org.aion.type.api.util.ByteArrayWrapper;
 import org.aion.vm.api.interfaces.Address;
 
 /**
  * The Transaction return data structure, typically used in Transaction getter API.
  *
  * @author Jay Tseng
- * @see org.aion.api.IChain#getTransactionByBlockHashAndIndex(org.aion.base.type.Hash256, int)
+ * @see org.aion.api.IChain#getTransactionByBlockHashAndIndex(Hash256, int)
  *     getTransactionByBlockHashAndIndex
  * @see org.aion.api.IChain#getTransactionByBlockNumberAndIndex(long, int)
  *     GetTransactionByBlockNumberAndIndex
- * @see org.aion.api.IChain#getTransactionByHash(org.aion.base.type.Hash256) getTransactionByHash
+ * @see org.aion.api.IChain#getTransactionByHash(Hash256) getTransactionByHash
  */
 public final class Transaction {
 
diff --git a/src/org/aion/api/type/TxArgs.java b/src/org/aion/api/type/TxArgs.java
index 66685d3..49b8c0e 100644
--- a/src/org/aion/api/type/TxArgs.java
+++ b/src/org/aion/api/type/TxArgs.java
@@ -5,8 +5,8 @@
 
 import java.math.BigInteger;
 import org.aion.api.ITx;
-import org.aion.base.type.AionAddress;
-import org.aion.base.util.ByteArrayWrapper;
+import org.aion.type.api.type.AionAddress;
+import org.aion.type.api.util.ByteArrayWrapper;
 import org.aion.vm.api.interfaces.Address;
 
 /**
diff --git a/src/org/aion/api/type/TxDetails.java b/src/org/aion/api/type/TxDetails.java
index dc9470e..039d2a4 100644
--- a/src/org/aion/api/type/TxDetails.java
+++ b/src/org/aion/api/type/TxDetails.java
@@ -2,13 +2,13 @@
 
 import java.math.BigInteger;
 import java.util.List;
-import org.aion.base.type.Hash256;
-import org.aion.base.util.ByteArrayWrapper;
+import org.aion.type.api.type.Hash256;
+import org.aion.type.api.util.ByteArrayWrapper;
 import org.aion.vm.api.interfaces.Address;
 
 /**
  * TxLog class containing all relevant information to transaction log utilized by {@link
- * org.aion.api.ITx#getTxReceipt(org.aion.base.type.Hash256) getTxReceipt}.
+ * org.aion.api.ITx#getTxReceipt(Hash256) getTxReceipt}.
  *
  * @author Jay Tseng
  * @see org.aion.api.type.TxReceipt TxReceipt
diff --git a/src/org/aion/api/type/TxLog.java b/src/org/aion/api/type/TxLog.java
index 4ccabf5..15233cd 100644
--- a/src/org/aion/api/type/TxLog.java
+++ b/src/org/aion/api/type/TxLog.java
@@ -1,12 +1,13 @@
 package org.aion.api.type;
 
 import java.util.List;
-import org.aion.base.util.ByteArrayWrapper;
+import org.aion.type.api.type.Hash256;
+import org.aion.type.api.util.ByteArrayWrapper;
 import org.aion.vm.api.interfaces.Address;
 
 /**
  * TxLog class containing all relevant information to transaction log utilized by {@link
- * org.aion.api.ITx#getTxReceipt(org.aion.base.type.Hash256) getTxReceipt}.
+ * org.aion.api.ITx#getTxReceipt(Hash256) getTxReceipt}.
  *
  * @author Jay Tseng
  * @see org.aion.api.type.TxReceipt TxReceipt
diff --git a/src/org/aion/api/type/TxReceipt.java b/src/org/aion/api/type/TxReceipt.java
index 3d91816..cfa5fde 100644
--- a/src/org/aion/api/type/TxReceipt.java
+++ b/src/org/aion/api/type/TxReceipt.java
@@ -1,7 +1,7 @@
 package org.aion.api.type;
 
 import java.util.List;
-import org.aion.base.type.Hash256;
+import org.aion.type.api.type.Hash256;
 import org.aion.vm.api.interfaces.Address;
 
 /**
diff --git a/src/org/aion/api/type/core/account/KdfParams.java b/src/org/aion/api/type/core/account/KdfParams.java
index fbcb9e7..2bcdd22 100644
--- a/src/org/aion/api/type/core/account/KdfParams.java
+++ b/src/org/aion/api/type/core/account/KdfParams.java
@@ -1,7 +1,7 @@
 package org.aion.api.type.core.account;
 
 import java.io.UnsupportedEncodingException;
-import org.aion.base.util.ByteUtil;
+import org.aion.type.api.util.ByteUtil;
 import org.aion.rlp.RLP;
 import org.aion.rlp.RLPList;
 
diff --git a/src/org/aion/api/type/core/account/KeystoreItem.java b/src/org/aion/api/type/core/account/KeystoreItem.java
index 7d821cc..3b44f15 100644
--- a/src/org/aion/api/type/core/account/KeystoreItem.java
+++ b/src/org/aion/api/type/core/account/KeystoreItem.java
@@ -1,7 +1,7 @@
 package org.aion.api.type.core.account;
 
 import java.io.UnsupportedEncodingException;
-import org.aion.base.util.ByteUtil;
+import org.aion.type.api.util.ByteUtil;
 import org.aion.rlp.RLP;
 import org.aion.rlp.RLPList;
 
diff --git a/src/org/aion/api/type/core/tx/AbstractTransaction.java b/src/org/aion/api/type/core/tx/AbstractTransaction.java
index 8652e8c..c981382 100644
--- a/src/org/aion/api/type/core/tx/AbstractTransaction.java
+++ b/src/org/aion/api/type/core/tx/AbstractTransaction.java
@@ -2,7 +2,7 @@
 
 import org.aion.api.log.AionLoggerFactory;
 import org.aion.api.log.LogEnum;
-import org.aion.base.type.ITransaction;
+import org.aion.type.api.type.ITransaction;
 import org.aion.crypto.ISignature;
 import org.aion.vm.api.interfaces.Address;
 import org.slf4j.Logger;
diff --git a/src/org/aion/api/type/core/tx/AionTransaction.java b/src/org/aion/api/type/core/tx/AionTransaction.java
index 45636fc..9acd464 100644
--- a/src/org/aion/api/type/core/tx/AionTransaction.java
+++ b/src/org/aion/api/type/core/tx/AionTransaction.java
@@ -1,12 +1,12 @@
 package org.aion.api.type.core.tx;
 
-import static org.aion.base.util.ByteUtil.ZERO_BYTE_ARRAY;
+import static org.aion.type.api.util.ByteUtil.ZERO_BYTE_ARRAY;
 
 import java.math.BigInteger;
 import java.util.Arrays;
-import org.aion.base.type.AionAddress;
-import org.aion.base.util.ByteUtil;
-import org.aion.base.util.TimeInstant;
+import org.aion.type.api.type.AionAddress;
+import org.aion.type.api.util.ByteUtil;
+import org.aion.type.api.util.TimeInstant;
 import org.aion.crypto.ECKey;
 import org.aion.crypto.ECKey.MissingPrivateKeyException;
 import org.aion.crypto.HashUtil;
diff --git a/src/org/aion/api/type/core/tx/DataWord.java b/src/org/aion/api/type/core/tx/DataWord.java
index 0c1abff..f14c00a 100644
--- a/src/org/aion/api/type/core/tx/DataWord.java
+++ b/src/org/aion/api/type/core/tx/DataWord.java
@@ -3,11 +3,11 @@
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import org.aion.base.util.ByteArrayWrapper;
-import org.aion.base.util.ByteUtil;
-import org.aion.base.util.FastByteComparisons;
-import org.aion.base.util.Hex;
-import org.aion.base.vm.IDataWord;
+import org.aion.type.api.util.ByteArrayWrapper;
+import org.aion.type.api.util.ByteUtil;
+import org.aion.type.api.util.FastByteComparisons;
+import org.aion.type.api.util.Hex;
+import org.aion.type.api.vm.IDataWord;
 
 /**
  * Data word is the basic unit data used by Fvm. The size of a data word is specified to 128 bits.
diff --git a/test/org/aion/api/test/BaseAPITests.java b/test/org/aion/api/test/BaseAPITests.java
index 4c3964e..f19e271 100755
--- a/test/org/aion/api/test/BaseAPITests.java
+++ b/test/org/aion/api/test/BaseAPITests.java
@@ -51,10 +51,10 @@
 import org.aion.api.type.TxArgs;
 import org.aion.api.type.TxReceipt;
 import org.aion.api.type.core.tx.AionTransaction;
-import org.aion.base.type.AionAddress;
-import org.aion.base.type.Hash256;
-import org.aion.base.util.ByteArrayWrapper;
-import org.aion.base.util.Bytesable;
+import org.aion.type.api.type.AionAddress;
+import org.aion.type.api.type.Hash256;
+import org.aion.type.api.util.ByteArrayWrapper;
+import org.aion.type.api.util.Bytesable;
 import org.aion.crypto.ECKey;
 import org.aion.crypto.ECKeyFac;
 import org.aion.vm.api.interfaces.Address;
diff --git a/test/org/aion/api/test/ContractTests.java b/test/org/aion/api/test/ContractTests.java
index 24107f4..0975a8d 100644
--- a/test/org/aion/api/test/ContractTests.java
+++ b/test/org/aion/api/test/ContractTests.java
@@ -37,8 +37,8 @@
 import org.aion.api.sol.IUint;
 import org.aion.api.type.ApiMsg;
 import org.aion.api.type.ContractResponse;
-import org.aion.base.type.AionAddress;
-import org.aion.base.util.ByteArrayWrapper;
+import org.aion.type.api.type.AionAddress;
+import org.aion.type.api.util.ByteArrayWrapper;
 import org.aion.vm.api.interfaces.Address;
 import org.junit.Before;
 import org.junit.Ignore;
diff --git a/test/org/aion/api/test/SimpleBench.java b/test/org/aion/api/test/SimpleBench.java
index 0d55d69..0bc14ad 100644
--- a/test/org/aion/api/test/SimpleBench.java
+++ b/test/org/aion/api/test/SimpleBench.java
@@ -23,7 +23,7 @@
 import org.aion.api.type.ApiMsg;
 import org.aion.api.type.ContractResponse;
 import org.aion.api.type.MsgRsp;
-import org.aion.base.util.ByteArrayWrapper;
+import org.aion.type.api.util.ByteArrayWrapper;
 import org.aion.vm.api.interfaces.Address;
 
 /** Created by Jay Tseng on 18/05/17. */