diff --git a/agents/rust/mediator/src/aries_agent/client.rs b/agents/rust/mediator/src/aries_agent/client.rs
index ad7b33c850..947ae59782 100644
--- a/agents/rust/mediator/src/aries_agent/client.rs
+++ b/agents/rust/mediator/src/aries_agent/client.rs
@@ -16,6 +16,7 @@ use aries_vcx::{
     utils::{encryption_envelope::EncryptionEnvelope, mockdata::profile::mock_ledger::MockLedger},
 };
 use aries_vcx_core::wallet::base_wallet::BaseWallet;
+use mediation::storage::MediatorPersistence;
 use messages::{
     msg_fields::protocols::{
         connection::{response::Response, Connection},
@@ -23,7 +24,6 @@ use messages::{
     },
     AriesMessage,
 };
-use mediation::storage::MediatorPersistence;
 
 // use super::transports::AriesTransport;
 // use diddoc_legacy::aries::service::AriesService;
diff --git a/agents/rust/mediator/src/aries_agent/mod.rs b/agents/rust/mediator/src/aries_agent/mod.rs
index 3c085ac033..7f4fbddb14 100644
--- a/agents/rust/mediator/src/aries_agent/mod.rs
+++ b/agents/rust/mediator/src/aries_agent/mod.rs
@@ -15,6 +15,7 @@ use aries_vcx_core::{
     WalletHandle,
 };
 use diddoc_legacy::aries::{diddoc::AriesDidDoc, service::AriesService};
+use mediation::storage::{get_persistence, MediatorPersistence};
 use messages::{
     msg_fields::protocols::{
         connection::{request::Request, response::Response, Connection},
@@ -23,7 +24,6 @@ use messages::{
     AriesMessage,
 };
 use serde_json::json;
-use mediation::storage::{get_persistence, MediatorPersistence};
 
 use self::transports::AriesTransport;
 use crate::utils::{prelude::*, structs::VeriKey};
diff --git a/agents/rust/mediator/src/http_routes/client.rs b/agents/rust/mediator/src/http_routes/client.rs
index 7bfd82884f..7d908155ca 100644
--- a/agents/rust/mediator/src/http_routes/client.rs
+++ b/agents/rust/mediator/src/http_routes/client.rs
@@ -2,9 +2,9 @@ use std::collections::VecDeque;
 
 use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use axum::routing::post;
+use mediation::storage::MediatorPersistence;
 use messages::msg_fields::protocols::out_of_band::invitation::Invitation as OOBInvitation;
 use serde_json::json;
-use mediation::storage::MediatorPersistence;
 
 use super::*;
 use crate::aries_agent::transports::AriesReqwest;
diff --git a/agents/rust/mediator/src/http_routes/mod.rs b/agents/rust/mediator/src/http_routes/mod.rs
index 1526c7796b..4b1ebc4edc 100644
--- a/agents/rust/mediator/src/http_routes/mod.rs
+++ b/agents/rust/mediator/src/http_routes/mod.rs
@@ -11,9 +11,6 @@ use axum::{
     Json, Router,
 };
 use log::info;
-use messages::{msg_fields::protocols::connection::Connection, AriesMessage};
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
 use mediation::{
     didcomm_types::{
         mediator_coord_structs::{MediateGrantData, MediatorCoordMsgEnum},
@@ -21,6 +18,9 @@ use mediation::{
     },
     storage::MediatorPersistence,
 };
+use messages::{msg_fields::protocols::connection::Connection, AriesMessage};
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
 
 use crate::{aries_agent::Agent, utils::string_from_std_error};
 type ArcAgent<T, P> = Arc<Agent<T, P>>;
diff --git a/agents/rust/mediator/src/tui.rs b/agents/rust/mediator/src/tui.rs
index 50511eca30..eb881d6098 100644
--- a/agents/rust/mediator/src/tui.rs
+++ b/agents/rust/mediator/src/tui.rs
@@ -14,8 +14,8 @@ use cursive::{
 };
 use futures::executor::block_on;
 use log::info;
-use messages::msg_fields::protocols::out_of_band::invitation::Invitation as OOBInvitation;
 use mediation::storage::MediatorPersistence;
+use messages::msg_fields::protocols::out_of_band::invitation::Invitation as OOBInvitation;
 
 use crate::{aries_agent::Agent, http_routes::client::handle_register};
 
diff --git a/agents/rust/mediator/tests/mediator-coord.rs b/agents/rust/mediator/tests/mediator-coord.rs
index a87ec947ce..d4e91e87da 100644
--- a/agents/rust/mediator/tests/mediator-coord.rs
+++ b/agents/rust/mediator/tests/mediator-coord.rs
@@ -4,6 +4,13 @@ use std::collections::VecDeque;
 use aries_vcx::protocols::connection::invitee::{states::completed::Completed, InviteeConnection};
 use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use common::{prelude::*, test_setup::OneTimeInit};
+use mediation::{
+    didcomm_types::mediator_coord_structs::{
+        KeylistData, KeylistQueryData, KeylistUpdateItem, KeylistUpdateItemAction,
+        KeylistUpdateRequestData, MediatorCoordMsgEnum,
+    },
+    storage::MediatorPersistence,
+};
 use mediator::{
     aries_agent::{
         transports::{AriesReqwest, AriesTransport},
@@ -13,13 +20,6 @@ use mediator::{
 };
 use messages::msg_fields::protocols::out_of_band::invitation::Invitation as OOBInvitation;
 use reqwest::header::ACCEPT;
-use mediation::{
-    didcomm_types::mediator_coord_structs::{
-        KeylistData, KeylistQueryData, KeylistUpdateItem, KeylistUpdateItemAction,
-        KeylistUpdateRequestData, MediatorCoordMsgEnum,
-    },
-    storage::MediatorPersistence,
-};
 
 const ENDPOINT_ROOT: &str = "http://localhost:8005";