diff --git a/src/cache.rs b/src/cache.rs
index aae5f5c..1402dc9 100644
--- a/src/cache.rs
+++ b/src/cache.rs
@@ -1,7 +1,5 @@
 use crate::kv;
-use domain::base::question::Question;
-use domain::base::rdata::UnknownRecordData;
-use domain::base::{Dname, Record};
+use domain::base::{rdata::UnknownRecordData, Dname, Question, Record};
 use js_sys::Date;
 use serde::{Deserialize, Serialize};
 
diff --git a/src/client.rs b/src/client.rs
index f8e9584..de420ac 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -1,12 +1,10 @@
 use crate::cache::DnsCache;
 use crate::r#override::OverrideResolver;
-use domain::base::iana::{Opcode, Rcode};
-use domain::base::message::Message;
-use domain::base::message_builder::MessageBuilder;
-use domain::base::question::Question;
-use domain::base::rdata::UnknownRecordData;
-use domain::base::record::Record;
-use domain::base::{Dname, ParsedDname, ToDname};
+use domain::base::{
+    iana::{Opcode, Rcode},
+    rdata::UnknownRecordData,
+    Dname, Message, MessageBuilder, ParsedDname, Question, Record, ToDname,
+};
 use js_sys::{ArrayBuffer, Uint8Array};
 use wasm_bindgen_futures::JsFuture;
 use web_sys::{Headers, Request, RequestInit, Response};
diff --git a/src/override.rs b/src/override.rs
index a3e0b97..c9ecfde 100644
--- a/src/override.rs
+++ b/src/override.rs
@@ -1,6 +1,4 @@
-use domain::base::rdata::UnknownRecordData;
-use domain::base::{question::Question, Compose};
-use domain::base::{Dname, Record, Rtype};
+use domain::base::{rdata::UnknownRecordData, Compose, Dname, Question, Record, Rtype};
 use domain::rdata::{Aaaa, AllRecordData, A};
 use std::collections::HashMap;
 use std::net::IpAddr;
diff --git a/src/server.rs b/src/server.rs
index c16c035..444cd78 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -1,13 +1,11 @@
 use crate::client::Client;
 use crate::r#override::OverrideResolver;
 use async_static::async_static;
-use domain::base::iana::{Opcode, Rcode};
-use domain::base::message::Message;
-use domain::base::message_builder::MessageBuilder;
-use domain::base::question::Question;
-use domain::base::rdata::UnknownRecordData;
-use domain::base::record::Record;
-use domain::base::{Dname, ToDname};
+use domain::base::{
+    iana::{Opcode, Rcode},
+    rdata::UnknownRecordData,
+    Dname, Message, MessageBuilder, Question, Record, ToDname,
+};
 use js_sys::{ArrayBuffer, Uint8Array};
 use serde::Deserialize;
 use std::borrow::Borrow;
diff --git a/src/util.rs b/src/util.rs
index 0550246..697d6fa 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -1,4 +1,4 @@
-use domain::base::message::Message;
+use domain::base::Message;
 use js_sys::{Math, Promise};
 use std::ops::Add;
 use std::{collections::hash_map::DefaultHasher, hash::Hasher};