diff --git a/src/neo/SmartContract/Native/KeyBuilder.cs b/src/neo/SmartContract/KeyBuilder.cs
similarity index 96%
rename from src/neo/SmartContract/Native/KeyBuilder.cs
rename to src/neo/SmartContract/KeyBuilder.cs
index 0d6c80970e..c725da370b 100644
--- a/src/neo/SmartContract/Native/KeyBuilder.cs
+++ b/src/neo/SmartContract/KeyBuilder.cs
@@ -3,9 +3,9 @@
 using System;
 using System.IO;
 
-namespace Neo.SmartContract.Native
+namespace Neo.SmartContract
 {
-    internal class KeyBuilder
+    public class KeyBuilder
     {
         private readonly int id;
         private readonly MemoryStream stream = new MemoryStream();
diff --git a/tests/neo.UnitTests/SmartContract/Native/Tokens/UT_NeoToken.cs b/tests/neo.UnitTests/SmartContract/Native/Tokens/UT_NeoToken.cs
index 4010acf625..eca3d9faa7 100644
--- a/tests/neo.UnitTests/SmartContract/Native/Tokens/UT_NeoToken.cs
+++ b/tests/neo.UnitTests/SmartContract/Native/Tokens/UT_NeoToken.cs
@@ -1,6 +1,5 @@
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Neo.Consensus;
 using Neo.Cryptography;
 using Neo.Cryptography.ECC;
 using Neo.IO;
@@ -14,7 +13,6 @@
 using Neo.VM;
 using Neo.Wallets;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
 using static Neo.SmartContract.Native.Tokens.NeoToken;
diff --git a/tests/neo.UnitTests/SmartContract/Native/UT_KeyBuilder.cs b/tests/neo.UnitTests/SmartContract/UT_KeyBuilder.cs
similarity index 93%
rename from tests/neo.UnitTests/SmartContract/Native/UT_KeyBuilder.cs
rename to tests/neo.UnitTests/SmartContract/UT_KeyBuilder.cs
index 9db398f0cb..39c2018f25 100644
--- a/tests/neo.UnitTests/SmartContract/Native/UT_KeyBuilder.cs
+++ b/tests/neo.UnitTests/SmartContract/UT_KeyBuilder.cs
@@ -1,7 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Neo.SmartContract.Native;
+using Neo.SmartContract;
 
-namespace Neo.UnitTests.SmartContract.Native
+namespace Neo.UnitTests.SmartContract
 {
     [TestClass]
     public class UT_KeyBuilder