diff --git a/src/bank.rs b/src/bank.rs
index 43db3efa2..42d8373ed 100644
--- a/src/bank.rs
+++ b/src/bank.rs
@@ -31,6 +31,7 @@ use solana_sdk::signature::Signature;
 use solana_sdk::storage_program;
 use solana_sdk::system_instruction::SystemInstruction;
 use solana_sdk::system_program;
+use solana_sdk::system_transaction::SystemTransaction;
 use solana_sdk::timing::{duration_as_us, timestamp};
 use solana_sdk::token_program;
 use solana_sdk::transaction::Transaction;
@@ -41,7 +42,6 @@ use std::result;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::{Arc, Mutex, RwLock};
 use std::time::Instant;
-use solana_sdk::system_transaction::SystemTransaction;
 use tokio::prelude::Future;
 
 /// The number of most recent `last_id` values that the bank will track the signatures
@@ -1431,9 +1431,9 @@ mod tests {
     use solana_sdk::hash::hash;
     use solana_sdk::signature::Keypair;
     use solana_sdk::signature::KeypairUtil;
+    use solana_sdk::system_transaction::SystemTransaction;
     use solana_sdk::transaction::Instruction;
     use std;
-    use solana_sdk::system_transaction::SystemTransaction;
     use tokio::prelude::{Async, Stream};
 
     #[test]
diff --git a/src/banking_stage.rs b/src/banking_stage.rs
index 8e86b0083..88ff34239 100644
--- a/src/banking_stage.rs
+++ b/src/banking_stage.rs
@@ -256,9 +256,9 @@ mod tests {
     use mint::Mint;
     use packet::to_packets;
     use solana_sdk::signature::{Keypair, KeypairUtil};
+    use solana_sdk::system_transaction::SystemTransaction;
     use solana_sdk::transaction::Transaction;
     use std::thread::sleep;
-    use solana_sdk::system_transaction::SystemTransaction;
 
     #[test]
     fn test_banking_stage_shutdown1() {
diff --git a/src/entry.rs b/src/entry.rs
index 3d78c9f58..cb5a4645f 100644
--- a/src/entry.rs
+++ b/src/entry.rs
@@ -277,8 +277,8 @@ mod tests {
     use solana_sdk::budget_transaction::BudgetTransaction;
     use solana_sdk::hash::hash;
     use solana_sdk::signature::{Keypair, KeypairUtil};
-    use solana_sdk::transaction::Transaction;
     use solana_sdk::system_transaction::SystemTransaction;
+    use solana_sdk::transaction::Transaction;
 
     #[test]
     fn test_entry_verify() {
diff --git a/src/leader_scheduler.rs b/src/leader_scheduler.rs
index c0b55e3db..4bedb277d 100644
--- a/src/leader_scheduler.rs
+++ b/src/leader_scheduler.rs
@@ -10,12 +10,12 @@ use ledger::create_ticks;
 use solana_sdk::hash::{hash, Hash};
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::{Keypair, KeypairUtil};
+use solana_sdk::system_transaction::SystemTransaction;
 use solana_sdk::transaction::Transaction;
 use solana_sdk::vote_program::{self, Vote, VoteProgram};
 use solana_sdk::vote_transaction::VoteTransaction;
 use std::collections::HashSet;
 use std::io::Cursor;
-use solana_sdk::system_transaction::SystemTransaction;
 
 pub const DEFAULT_BOOTSTRAP_HEIGHT: u64 = 1000;
 pub const DEFAULT_LEADER_ROTATION_INTERVAL: u64 = 100;
diff --git a/src/ledger.rs b/src/ledger.rs
index 28b3fa7c4..be8787f46 100644
--- a/src/ledger.rs
+++ b/src/ledger.rs
@@ -15,13 +15,13 @@ use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::{Keypair, KeypairUtil};
 use solana_sdk::transaction::Transaction;
 use solana_sdk::vote_program::Vote;
+use solana_sdk::vote_transaction::VoteTransaction;
 use std::fs::{copy, create_dir_all, remove_dir_all, File, OpenOptions};
 use std::io::prelude::*;
 use std::io::{self, BufReader, BufWriter, Seek, SeekFrom};
 use std::mem::size_of;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use std::path::Path;
-use solana_sdk::vote_transaction::VoteTransaction;
 
 //
 // A persistent ledger is 2 files:
diff --git a/src/mint.rs b/src/mint.rs
index 1566add7c..001bee7fe 100644
--- a/src/mint.rs
+++ b/src/mint.rs
@@ -5,8 +5,8 @@ use ring::rand::SystemRandom;
 use solana_sdk::hash::{hash, Hash};
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::{Keypair, KeypairUtil};
-use solana_sdk::transaction::Transaction;
 use solana_sdk::system_transaction::SystemTransaction;
+use solana_sdk::transaction::Transaction;
 use untrusted::Input;
 
 #[derive(Serialize, Deserialize, Debug)]
diff --git a/src/packet.rs b/src/packet.rs
index 2722a94fb..30a036de9 100644
--- a/src/packet.rs
+++ b/src/packet.rs
@@ -469,11 +469,11 @@ mod tests {
     };
     use solana_sdk::hash::Hash;
     use solana_sdk::signature::{Keypair, KeypairUtil};
+    use solana_sdk::system_transaction::SystemTransaction;
     use solana_sdk::transaction::Transaction;
     use std::io;
     use std::io::Write;
     use std::net::UdpSocket;
-    use solana_sdk::system_transaction::SystemTransaction;
 
     #[test]
     pub fn packet_send_recv() {
diff --git a/src/rpc.rs b/src/rpc.rs
index 3398dcd8f..6137c48db 100644
--- a/src/rpc.rs
+++ b/src/rpc.rs
@@ -375,10 +375,10 @@ mod tests {
     use rpc_request::get_rpc_request_str;
     use solana_sdk::hash::{hash, Hash};
     use solana_sdk::signature::{Keypair, KeypairUtil};
+    use solana_sdk::system_transaction::SystemTransaction;
     use solana_sdk::transaction::Transaction;
     use std::fs::remove_dir_all;
     use std::net::{IpAddr, Ipv4Addr, SocketAddr};
-    use solana_sdk::system_transaction::SystemTransaction;
 
     fn start_rpc_handler_with_tx(pubkey: Pubkey) -> (MetaIoHandler<Meta>, Meta, Hash, Keypair) {
         let alice = Mint::new(10_000);
diff --git a/src/rpc_pubsub.rs b/src/rpc_pubsub.rs
index 516551df2..474ff7a5b 100644
--- a/src/rpc_pubsub.rs
+++ b/src/rpc_pubsub.rs
@@ -251,9 +251,9 @@ mod tests {
     use solana_sdk::budget_program;
     use solana_sdk::budget_transaction::BudgetTransaction;
     use solana_sdk::signature::{Keypair, KeypairUtil};
+    use solana_sdk::system_transaction::SystemTransaction;
     use solana_sdk::transaction::Transaction;
     use std::net::{IpAddr, Ipv4Addr};
-    use solana_sdk::system_transaction::SystemTransaction;
     use tokio::prelude::{Async, Stream};
 
     #[test]
diff --git a/src/storage_stage.rs b/src/storage_stage.rs
index 526b29340..030682a21 100644
--- a/src/storage_stage.rs
+++ b/src/storage_stage.rs
@@ -12,13 +12,13 @@ use solana_sdk::hash::Hash;
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::Keypair;
 use solana_sdk::signature::Signature;
+use solana_sdk::vote_program;
 use std::mem::size_of;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::mpsc::RecvTimeoutError;
 use std::sync::{Arc, RwLock};
 use std::thread::{self, Builder, JoinHandle};
 use std::time::Duration;
-use solana_sdk::vote_program;
 
 // Block of hash answers to validate against
 // Vec of [ledger blocks] x [keys]
@@ -268,6 +268,8 @@ mod tests {
     use solana_sdk::hash::Hash;
     use solana_sdk::signature::{Keypair, KeypairUtil};
     use solana_sdk::transaction::Transaction;
+    use solana_sdk::vote_program::Vote;
+    use solana_sdk::vote_transaction::VoteTransaction;
     use std::cmp::{max, min};
     use std::fs::remove_dir_all;
     use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
@@ -278,8 +280,6 @@ mod tests {
     use storage_stage::StorageState;
     use storage_stage::NUM_IDENTITIES;
     use storage_stage::{get_identity_index_from_pubkey, StorageStage};
-    use solana_sdk::vote_program::Vote;
-    use solana_sdk::vote_transaction::VoteTransaction;
 
     #[test]
     fn test_storage_stage_none_ledger() {
diff --git a/src/thin_client.rs b/src/thin_client.rs
index 54b065a16..892b53f6c 100644
--- a/src/thin_client.rs
+++ b/src/thin_client.rs
@@ -19,6 +19,7 @@ use solana_sdk::account::Account;
 use solana_sdk::hash::Hash;
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::{Keypair, Signature};
+use solana_sdk::system_transaction::SystemTransaction;
 use solana_sdk::timing;
 use solana_sdk::transaction::Transaction;
 use std;
@@ -30,7 +31,6 @@ use std::sync::{Arc, RwLock};
 use std::thread::sleep;
 use std::time::Duration;
 use std::time::Instant;
-use solana_sdk::system_transaction::SystemTransaction;
 
 /// An object for querying and sending transactions to the network.
 pub struct ThinClient {
@@ -438,9 +438,9 @@ mod tests {
     use mint::Mint;
     use solana_sdk::signature::{Keypair, KeypairUtil};
     use solana_sdk::system_instruction::SystemInstruction;
-    use std::fs::remove_dir_all;
     use solana_sdk::vote_program::VoteProgram;
     use solana_sdk::vote_transaction::VoteTransaction;
+    use std::fs::remove_dir_all;
 
     #[test]
     fn test_thin_client() {
diff --git a/src/tvu.rs b/src/tvu.rs
index 06214c332..16cef3201 100644
--- a/src/tvu.rs
+++ b/src/tvu.rs
@@ -179,6 +179,7 @@ pub mod tests {
     use service::Service;
     use solana_sdk::hash::Hash;
     use solana_sdk::signature::{Keypair, KeypairUtil};
+    use solana_sdk::system_transaction::SystemTransaction;
     use solana_sdk::transaction::Transaction;
     use std::fs::remove_dir_all;
     use std::net::UdpSocket;
@@ -187,7 +188,6 @@ pub mod tests {
     use std::sync::{Arc, RwLock};
     use std::time::Duration;
     use streamer;
-    use solana_sdk::system_transaction::SystemTransaction;
     use tvu::Tvu;
     use window::{self, SharedWindow};
 
diff --git a/src/vote_stage.rs b/src/vote_stage.rs
index fc1e23d04..4ad743d03 100644
--- a/src/vote_stage.rs
+++ b/src/vote_stage.rs
@@ -10,12 +10,12 @@ use result::{Error, Result};
 use solana_sdk::hash::Hash;
 use solana_sdk::signature::Keypair;
 use solana_sdk::transaction::Transaction;
+use solana_sdk::vote_program::Vote;
+use solana_sdk::vote_transaction::VoteTransaction;
 use std::net::SocketAddr;
 use std::sync::atomic::AtomicUsize;
 use std::sync::{Arc, RwLock};
 use streamer::BlobSender;
-use solana_sdk::vote_program::Vote;
-use solana_sdk::vote_transaction::VoteTransaction;
 
 #[derive(Debug, PartialEq, Eq)]
 pub enum VoteError {
diff --git a/src/wallet.rs b/src/wallet.rs
index a4813d15f..e7fa56909 100644
--- a/src/wallet.rs
+++ b/src/wallet.rs
@@ -17,6 +17,7 @@ use solana_sdk::hash::Hash;
 use solana_sdk::loader_transaction::LoaderTransaction;
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::{Keypair, KeypairUtil, Signature};
+use solana_sdk::system_transaction::SystemTransaction;
 use solana_sdk::transaction::Transaction;
 use std::fs::{self, File};
 use std::io::Write;
@@ -26,7 +27,6 @@ use std::str::FromStr;
 use std::thread::sleep;
 use std::time::Duration;
 use std::{error, fmt, mem};
-use solana_sdk::system_transaction::SystemTransaction;
 use thin_client::poll_gossip_for_leader;
 
 const PLATFORM_SECTION_C: &str = ".text.entrypoint";