diff --git a/cmd/disasm/main.go b/cmd/disasm/main.go
index 5d42121b6ff2162c752676a24e72a4b0766a8e38..5b658046ffa4b30851c22cc1a606352333cdbee5 100644
--- a/cmd/disasm/main.go
+++ b/cmd/disasm/main.go
@@ -6,7 +6,7 @@ import (
 	"os"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/vm"
+	"github.com/ethereum/go-ethereum/core/vm"
 )
 
 func main() {
diff --git a/cmd/ethereum/admin.go b/cmd/ethereum/admin.go
index 65adb408669fbc615b34a9ba49c025fdddde54cc..139395dad9b9ba2af7aee2d7a984dcb6535d303c 100644
--- a/cmd/ethereum/admin.go
+++ b/cmd/ethereum/admin.go
@@ -12,7 +12,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/ethereum/go-ethereum/rpc"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/xeth"
 	"github.com/robertkrimen/otto"
 )
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index e351453b1aa8edc8102360d3710df533bc773a74..5ad4c0a4e5059d0f4327ec8968911769076ec571 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -36,7 +36,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/eth"
 	"github.com/ethereum/go-ethereum/logger"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/peterh/liner"
 )
 
diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go
index fdf573fd8ab65923e617d74ff8bebd99d7efcb89..f5b423e8d1c83f0f832bb6f3574cb30c9496e055 100644
--- a/cmd/ethtest/main.go
+++ b/cmd/ethtest/main.go
@@ -36,9 +36,9 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/logger"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/tests/helper"
-	"github.com/ethereum/go-ethereum/vm"
+	"github.com/ethereum/go-ethereum/core/vm"
 )
 
 type Log struct {
diff --git a/cmd/evm/main.go b/cmd/evm/main.go
index 17137e4bbb0510e44d6ddee940e4730bb598a6ce..76e34e21d6904158cc183c3ac7f7221f17555ced 100644
--- a/cmd/evm/main.go
+++ b/cmd/evm/main.go
@@ -35,8 +35,8 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/logger"
-	"github.com/ethereum/go-ethereum/state"
-	"github.com/ethereum/go-ethereum/vm"
+	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/core/vm"
 )
 
 var (
diff --git a/cmd/mist/bindings.go b/cmd/mist/bindings.go
index 5d45d927ea743536e130172b38e2701bbc7e2476..8a9ec7cb17d925354efe9759b08a1e65d58ba087 100644
--- a/cmd/mist/bindings.go
+++ b/cmd/mist/bindings.go
@@ -28,7 +28,7 @@ import (
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 type plugin struct {
diff --git a/core/asm.go b/core/asm.go
index fc3493fe1177574a45b9913539243a50b9309547..f40c079045ba9289a7adeefc4ea65d368b795de3 100644
--- a/core/asm.go
+++ b/core/asm.go
@@ -5,7 +5,7 @@ import (
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/vm"
+	"github.com/ethereum/go-ethereum/core/vm"
 )
 
 func Disassemble(script []byte) (asm []string) {
diff --git a/core/block_processor.go b/core/block_processor.go
index ae8d5fe7b6b010d6d3f3a2ece9415f2cdcc9b6b1..4bcede85e507a0a125834f3ad44f8dc67298703b 100644
--- a/core/block_processor.go
+++ b/core/block_processor.go
@@ -12,7 +12,7 @@ import (
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/pow"
 	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 	"gopkg.in/fatih/set.v0"
 )
 
diff --git a/core/chain_makers.go b/core/chain_makers.go
index e3001331ca93f20f2e8fd424b10adbad39686463..d559b2a3ae3b7ef3c09cd76a3e75403a1c003212 100644
--- a/core/chain_makers.go
+++ b/core/chain_makers.go
@@ -8,7 +8,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/pow"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 // So we can generate blocks easily
diff --git a/core/chain_manager.go b/core/chain_manager.go
index a3be3878fe270e446a83d5ec44a1caff88b9b2bb..3e030838a97ea08e71ad95fe781593c4ee831ff7 100644
--- a/core/chain_manager.go
+++ b/core/chain_manager.go
@@ -12,7 +12,7 @@ import (
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 var (
diff --git a/core/events.go b/core/events.go
index b93f27c51317e9914155e63dd5a04e36763c4539..3da668af5ecc946a797a265f032843c3f8e5f7dc 100644
--- a/core/events.go
+++ b/core/events.go
@@ -2,7 +2,7 @@ package core
 
 import (
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 // TxPreEvent is posted when a transaction enters the transaction pool.
diff --git a/core/execution.go b/core/execution.go
index 4f15fb42a91bb161aad53c2bb3d3f5af6aac201e..92d932a9f95ee57f3b383239e2271a0b1c596e17 100644
--- a/core/execution.go
+++ b/core/execution.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/state"
-	"github.com/ethereum/go-ethereum/vm"
+	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/core/vm"
 )
 
 type Execution struct {
diff --git a/core/filter.go b/core/filter.go
index b5d9deb7a6242f888f9338336d9b3af6d855711e..901931d99186e5d7dd3da3a0707668323f4c2d4c 100644
--- a/core/filter.go
+++ b/core/filter.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 type AccountChange struct {
diff --git a/core/genesis.go b/core/genesis.go
index 3e00533ae6f4bf39b066edaf6b67652ba783fcca..e0d3e51b8b65f874cc471e5af32ecdb92d8db519 100644
--- a/core/genesis.go
+++ b/core/genesis.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 /*
diff --git a/state/dump.go b/core/state/dump.go
similarity index 100%
rename from state/dump.go
rename to core/state/dump.go
diff --git a/state/errors.go b/core/state/errors.go
similarity index 100%
rename from state/errors.go
rename to core/state/errors.go
diff --git a/state/log.go b/core/state/log.go
similarity index 100%
rename from state/log.go
rename to core/state/log.go
diff --git a/state/main_test.go b/core/state/main_test.go
similarity index 100%
rename from state/main_test.go
rename to core/state/main_test.go
diff --git a/state/managed_state.go b/core/state/managed_state.go
similarity index 100%
rename from state/managed_state.go
rename to core/state/managed_state.go
diff --git a/state/managed_state_test.go b/core/state/managed_state_test.go
similarity index 100%
rename from state/managed_state_test.go
rename to core/state/managed_state_test.go
diff --git a/state/state_object.go b/core/state/state_object.go
similarity index 100%
rename from state/state_object.go
rename to core/state/state_object.go
diff --git a/state/state_test.go b/core/state/state_test.go
similarity index 100%
rename from state/state_test.go
rename to core/state/state_test.go
diff --git a/state/statedb.go b/core/state/statedb.go
similarity index 100%
rename from state/statedb.go
rename to core/state/statedb.go
diff --git a/core/state_transition.go b/core/state_transition.go
index d0b2c5d7c39e7c13034bfe5798f1bb11a6eba6dc..e530567d00282fb44301eda6411b3e4e196a83ff 100644
--- a/core/state_transition.go
+++ b/core/state_transition.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/state"
-	"github.com/ethereum/go-ethereum/vm"
+	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/core/vm"
 )
 
 const tryJit = false
diff --git a/core/transaction_pool_test.go b/core/transaction_pool_test.go
index bf9012573c14cc321e21d3e0b72918329b77f995..a009a4c9d377ad9bb7bef77c9893b10bf0ca2632 100644
--- a/core/transaction_pool_test.go
+++ b/core/transaction_pool_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 // State query interface
diff --git a/core/types/bloom9.go b/core/types/bloom9.go
index 64a8ff49a2466ca8a5876d1054195f9cea2cfc00..af90679cef7e6825d4c76e865a82663683203f11 100644
--- a/core/types/bloom9.go
+++ b/core/types/bloom9.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 func CreateBloom(receipts Receipts) Bloom {
diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go
index 0841bb859540f1a6042a93cb566733fefdb4acd6..3c95772ecb5d4f2bbc5ec1fa19dd088122f23518 100644
--- a/core/types/bloom9_test.go
+++ b/core/types/bloom9_test.go
@@ -4,7 +4,7 @@ package types
 import (
 	"testing"
 
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 func TestBloom9(t *testing.T) {
diff --git a/core/types/common.go b/core/types/common.go
index ce1090919b9be9116e3fcbbd82026541ef497c58..4397d4938e10b113867429f395838f469d9e9db9 100644
--- a/core/types/common.go
+++ b/core/types/common.go
@@ -4,7 +4,7 @@ import (
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 
 	"fmt"
 )
diff --git a/core/types/receipt.go b/core/types/receipt.go
index f88d42b29a08ada4eb614ab550276fdbc2a5d0e6..83c981f935cfb48f00928ba50ac38a5a141dafb3 100644
--- a/core/types/receipt.go
+++ b/core/types/receipt.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 type Receipt struct {
diff --git a/vm/address.go b/core/vm/address.go
similarity index 100%
rename from vm/address.go
rename to core/vm/address.go
diff --git a/vm/analysis.go b/core/vm/analysis.go
similarity index 100%
rename from vm/analysis.go
rename to core/vm/analysis.go
diff --git a/vm/asm.go b/core/vm/asm.go
similarity index 100%
rename from vm/asm.go
rename to core/vm/asm.go
diff --git a/vm/common.go b/core/vm/common.go
similarity index 100%
rename from vm/common.go
rename to core/vm/common.go
diff --git a/vm/context.go b/core/vm/context.go
similarity index 100%
rename from vm/context.go
rename to core/vm/context.go
diff --git a/vm/environment.go b/core/vm/environment.go
similarity index 97%
rename from vm/environment.go
rename to core/vm/environment.go
index 5d493166c91b622aa909dfa22910cfc0a2f04867..a0a18a99b55c7b7cc7bc096b21d41a41cb704d9a 100644
--- a/vm/environment.go
+++ b/core/vm/environment.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 type Environment interface {
diff --git a/vm/errors.go b/core/vm/errors.go
similarity index 100%
rename from vm/errors.go
rename to core/vm/errors.go
diff --git a/vm/gas.go b/core/vm/gas.go
similarity index 100%
rename from vm/gas.go
rename to core/vm/gas.go
diff --git a/vm/main_test.go b/core/vm/main_test.go
similarity index 100%
rename from vm/main_test.go
rename to core/vm/main_test.go
diff --git a/vm/memory.go b/core/vm/memory.go
similarity index 100%
rename from vm/memory.go
rename to core/vm/memory.go
diff --git a/vm/stack.go b/core/vm/stack.go
similarity index 100%
rename from vm/stack.go
rename to core/vm/stack.go
diff --git a/vm/types.go b/core/vm/types.go
similarity index 100%
rename from vm/types.go
rename to core/vm/types.go
diff --git a/vm/virtual_machine.go b/core/vm/virtual_machine.go
similarity index 100%
rename from vm/virtual_machine.go
rename to core/vm/virtual_machine.go
diff --git a/vm/vm.go b/core/vm/vm.go
similarity index 99%
rename from vm/vm.go
rename to core/vm/vm.go
index 7400a48c409cf940b5282cde2bc208132527a7e6..f4bf1ca72a6cad4be45f95dd5a27b920de3d667e 100644
--- a/vm/vm.go
+++ b/core/vm/vm.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 type Vm struct {
diff --git a/vm/vm_jit.go b/core/vm/vm_jit.go
similarity index 99%
rename from vm/vm_jit.go
rename to core/vm/vm_jit.go
index 9d26957f04786b71a66e15e0654748cccd3c64f8..2b88d8620276151a6b8661d58845334e4cc0cd13 100644
--- a/vm/vm_jit.go
+++ b/core/vm/vm_jit.go
@@ -19,7 +19,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 	"math/big"
 	"unsafe"
 )
diff --git a/vm/vm_jit_fake.go b/core/vm/vm_jit_fake.go
similarity index 100%
rename from vm/vm_jit_fake.go
rename to core/vm/vm_jit_fake.go
diff --git a/vm/vm_test.go b/core/vm/vm_test.go
similarity index 100%
rename from vm/vm_test.go
rename to core/vm/vm_test.go
diff --git a/core/vm_env.go b/core/vm_env.go
index 7845d1cd9597e8dbef1efe5a9ec283933d4cc34b..d786844dc2c8f2656c11621f705f01f6224e7078 100644
--- a/core/vm_env.go
+++ b/core/vm_env.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/state"
-	"github.com/ethereum/go-ethereum/vm"
+	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/core/vm"
 )
 
 type VMEnv struct {
diff --git a/eth/backend.go b/eth/backend.go
index 06c3cbd177709b919a198288f9a96becfa9c111c..11ef9660f784ff4b360403e1e52a057e2fe79723 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -21,7 +21,7 @@ import (
 	"github.com/ethereum/go-ethereum/p2p"
 	"github.com/ethereum/go-ethereum/p2p/discover"
 	"github.com/ethereum/go-ethereum/p2p/nat"
-	"github.com/ethereum/go-ethereum/vm"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/whisper"
 )
 
diff --git a/event/filter/eth_filter.go b/event/filter/eth_filter.go
index 1abd48389ed8b014ad6ffc8195524a95d4277fd4..dc032b5c21605ea93139a715f1247d364a8141a1 100644
--- a/event/filter/eth_filter.go
+++ b/event/filter/eth_filter.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 type FilterManager struct {
diff --git a/miner/worker.go b/miner/worker.go
index 587036f226eff43df8f7c9eef038adfabea7fbdb..e21765f9da97d56e9577bda20ca6f08f855a4453 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -13,7 +13,7 @@ import (
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/pow"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 	"gopkg.in/fatih/set.v0"
 )
 
diff --git a/rpc/responses.go b/rpc/responses.go
index 1ec5f08eb249e81b9e2dd3544d543a6abd98f894..993f467eaf18750ebadf00b602a0c554057ead39 100644
--- a/rpc/responses.go
+++ b/rpc/responses.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 type BlockRes struct {
diff --git a/tests/blocktest.go b/tests/blocktest.go
index 5719a835bad25ea71ce0dfbdbe601f5efb624c0c..34bd69ac85f0082bec3d07ffb5f3be06df1b974d 100644
--- a/tests/blocktest.go
+++ b/tests/blocktest.go
@@ -15,7 +15,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 // Block Test JSON Format
diff --git a/tests/helper/vm.go b/tests/helper/vm.go
index 44c1088702ded7c2608905477d8f7606de1d22aa..68ae8e97baaf4669b842320f8b13fb4486466d58 100644
--- a/tests/helper/vm.go
+++ b/tests/helper/vm.go
@@ -7,8 +7,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/state"
-	"github.com/ethereum/go-ethereum/vm"
+	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/core/vm"
 )
 
 type Env struct {
diff --git a/tests/vm/gh_test.go b/tests/vm/gh_test.go
index 68600d304071df083b4c14f4d6bac99b5f5372e4..123e8ccb567c71e86a567c654da35581ac002474 100644
--- a/tests/vm/gh_test.go
+++ b/tests/vm/gh_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/logger"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/tests/helper"
 )
 
diff --git a/vm/.ethtest b/vm/.ethtest
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/xeth/state.go b/xeth/state.go
index f645a9cacf9c45028e37ed4389aa35a2962e3423..b0f2ce019e8249eb34801ca3dcfd03117dd62146 100644
--- a/xeth/state.go
+++ b/xeth/state.go
@@ -2,7 +2,7 @@ package xeth
 
 import (
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 type State struct {
diff --git a/xeth/types.go b/xeth/types.go
index b4ba7bab0f5d19e752cc75b9915f2cca1cc5139f..09d0dc714a7aab4a0ead4cd5e24949bc494744f4 100644
--- a/xeth/types.go
+++ b/xeth/types.go
@@ -11,7 +11,7 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/p2p"
 	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 type Object struct {
diff --git a/xeth/xeth.go b/xeth/xeth.go
index f7f4ce0cfb5812a8daddf6da1bc30005516637b1..02a691ffb99ca9bf9a3a0440ccbf5b71c7104a22 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -19,7 +19,7 @@ import (
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/miner"
 	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/whisper"
 )