diff --git a/ethcore/src/engines/authority_round/mod.rs b/ethcore/src/engines/authority_round/mod.rs
index 6085b0064..8f2b94e70 100644
--- a/ethcore/src/engines/authority_round/mod.rs
+++ b/ethcore/src/engines/authority_round/mod.rs
@@ -25,8 +25,7 @@ use block::*;
 use builtin::Builtin;
 use client::{Client, EngineClient};
 use engines::{Call, Engine, Seal, EngineError, ConstructedVerifier, CloseOutcome};
-use trace::{Tracer, ExecutiveTracer};
-use types::trace_types::trace::{RewardType};
+use trace::{Tracer, ExecutiveTracer, RewardType};
 use error::{Error, TransactionError, BlockError};
 use ethjson;
 use header::{Header, BlockNumber};
diff --git a/ethcore/src/engines/null_engine.rs b/ethcore/src/engines/null_engine.rs
index 9c90715a4..0a31afc0e 100644
--- a/ethcore/src/engines/null_engine.rs
+++ b/ethcore/src/engines/null_engine.rs
@@ -25,8 +25,7 @@ use evm::Schedule;
 use header::BlockNumber;
 use error::Error;
 use state::CleanupMode;
-use trace::{Tracer, ExecutiveTracer};
-use types::trace_types::trace::{RewardType};
+use trace::{Tracer, ExecutiveTracer, RewardType};
 
 /// An engine which does not provide any consensus mechanism and does not seal blocks.
 pub struct NullEngine {
diff --git a/ethcore/src/engines/tendermint/mod.rs b/ethcore/src/engines/tendermint/mod.rs
index 02b67b716..a88a903eb 100644
--- a/ethcore/src/engines/tendermint/mod.rs
+++ b/ethcore/src/engines/tendermint/mod.rs
@@ -38,8 +38,7 @@ use account_provider::AccountProvider;
 use block::*;
 use spec::CommonParams;
 use engines::{Engine, Seal, EngineError, CloseOutcome, ConstructedVerifier};
-use trace::{Tracer, ExecutiveTracer};
-use types::trace_types::trace::{RewardType};
+use trace::{Tracer, ExecutiveTracer, RewardType};
 use state::CleanupMode;
 use io::IoService;
 use super::signer::EngineSigner;
diff --git a/ethcore/src/ethereum/ethash.rs b/ethcore/src/ethereum/ethash.rs
index f3f42b60a..d0560a2bf 100644
--- a/ethcore/src/ethereum/ethash.rs
+++ b/ethcore/src/ethereum/ethash.rs
@@ -21,8 +21,7 @@ use block::*;
 use builtin::Builtin;
 use evm::env_info::EnvInfo;
 use error::{BlockError, Error, TransactionError};
-use trace::{Tracer, ExecutiveTracer};
-use types::trace_types::trace::{RewardType};
+use trace::{Tracer, ExecutiveTracer,RewardType};
 use header::{Header, BlockNumber};
 use state::CleanupMode;
 use spec::CommonParams;
diff --git a/ethcore/src/tests/trace.rs b/ethcore/src/tests/trace.rs
index 4f077af32..2389a3c2e 100644
--- a/ethcore/src/tests/trace.rs
+++ b/ethcore/src/tests/trace.rs
@@ -31,9 +31,8 @@ use header::Header;
 use miner::Miner;
 use transaction::{Action, Transaction};
 use views::BlockView;
-use types::trace_types::trace::RewardType;
-use types::trace_types::trace::Action::Reward;
-use types::trace_types::localized::LocalizedTrace;
+use trace::{RewardType, LocalizedTrace};
+use trace::trace::Action::Reward;
 
 #[test]
 fn can_trace_block_and_uncle_reward() {
diff --git a/ethcore/src/trace/types/filter.rs b/ethcore/src/trace/types/filter.rs
index 00fff0014..68ab30a31 100644
--- a/ethcore/src/trace/types/filter.rs
+++ b/ethcore/src/trace/types/filter.rs
@@ -143,9 +143,8 @@ mod tests {
 	use util::sha3::Hashable;
 	use util::bloom::Bloomable;
 	use trace::trace::{Action, Call, Res, Create, CreateResult, Suicide, Reward};
-	use types::trace_types::trace::RewardType;
 	use trace::flat::FlatTrace;
-	use trace::{Filter, AddressesFilter, TraceError};
+	use trace::{Filter, AddressesFilter, TraceError, RewardType};
 	use evm::CallType;
 
 	#[test]
diff --git a/ethcore/src/trace/types/flat.rs b/ethcore/src/trace/types/flat.rs
index 536ecbef3..29d0eddb9 100644
--- a/ethcore/src/trace/types/flat.rs
+++ b/ethcore/src/trace/types/flat.rs
@@ -164,7 +164,7 @@ mod tests {
 	use super::{FlatBlockTraces, FlatTransactionTraces, FlatTrace};
 	use trace::trace::{Action, Res, CallResult, Call, Suicide, Reward};
 	use evm::CallType;
-    use types::trace_types::trace::RewardType;
+    use trace::RewardType;
 
 	#[test]
 	fn encode_flat_transaction_traces() {
diff --git a/rpc/src/v1/types/trace.rs b/rpc/src/v1/types/trace.rs
index 3de90a75d..d64a0347a 100644
--- a/rpc/src/v1/types/trace.rs
+++ b/rpc/src/v1/types/trace.rs
@@ -780,7 +780,7 @@ mod tests {
 			block_hash: 14.into(),
 		};
 		let serialized = serde_json::to_string(&t).unwrap();
-		assert_eq!(serialized, r#"{"type":"reward","action":{"miner":"0x0000000000000000000000000000000000000004","value":"0x0000000000000000000000000000000000000006","rewardType":"block"},"result":null,"traceAddress":[10],"subtraces":1,"transactionPosition":11,"transactionHash":"0x000000000000000000000000000000000000000000000000000000000000000c","blockNumber":13,"blockHash":"0x000000000000000000000000000000000000000000000000000000000000000e"}"#);
+		assert_eq!(serialized, r#"{"type":"reward","action":{"miner":"0x0000000000000000000000000000000000000004","value":"0x6","rewardType":"block"},"result":null,"traceAddress":[10],"subtraces":1,"transactionPosition":11,"transactionHash":"0x000000000000000000000000000000000000000000000000000000000000000c","blockNumber":13,"blockHash":"0x000000000000000000000000000000000000000000000000000000000000000e"}"#);
 	}
 
 	#[test]