diff --git a/src/client.rs b/src/client.rs
index 03baa40..1cc84b7 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -7,7 +7,7 @@
 //! use std::net::ToSocketAddrs;
 //!
 //! use epp_client::EppClient;
-//! use epp_client::domain::check::DomainCheck;
+//! use epp_client::domain::DomainCheck;
 //! use epp_client::common::NoExtension;
 //!
 //! #[tokio::main]
diff --git a/src/contact.rs b/src/contact.rs
index 5f79e4b..cb09467 100644
--- a/src/contact.rs
+++ b/src/contact.rs
@@ -6,10 +6,19 @@ use serde::{Deserialize, Serialize};
 use crate::common::StringValue;
 
 pub mod check;
+pub use check::ContactCheck;
+
 pub mod create;
+pub use create::ContactCreate;
+
 pub mod delete;
+pub use delete::ContactDelete;
+
 pub mod info;
+pub use info::ContactInfo;
+
 pub mod update;
+pub use update::ContactUpdate;
 
 pub const XMLNS: &str = "urn:ietf:params:xml:ns:contact-1.0";
 
diff --git a/src/domain.rs b/src/domain.rs
index 48a0238..58f6b6c 100644
--- a/src/domain.rs
+++ b/src/domain.rs
@@ -5,12 +5,25 @@ use serde::{Deserialize, Serialize};
 use crate::common::{HostAddr, StringValue};
 
 pub mod check;
+pub use check::DomainCheck;
+
 pub mod create;
+pub use create::DomainCreate;
+
 pub mod delete;
+pub use delete::DomainDelete;
+
 pub mod info;
+pub use info::DomainInfo;
+
 pub mod renew;
+pub use renew::DomainRenew;
+
 pub mod transfer;
+pub use transfer::DomainTransfer;
+
 pub mod update;
+pub use update::DomainUpdate;
 
 pub const XMLNS: &str = "urn:ietf:params:xml:ns:domain-1.0";
 
diff --git a/src/lib.rs b/src/lib.rs
index 5dad5ad..59d3323 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -43,7 +43,7 @@
 //! use std::net::ToSocketAddrs;
 //!
 //! use epp_client::EppClient;
-//! use epp_client::domain::check::DomainCheck;
+//! use epp_client::domain::DomainCheck;
 //! use epp_client::common::NoExtension;
 //! use epp_client::login::Login;
 //! use epp_client::logout::Logout;
@@ -108,17 +108,29 @@ pub mod extensions {
 
 pub mod host {
     pub mod check;
+    pub use check::HostCheck;
+
     pub mod create;
+    pub use create::HostCreate;
+
     pub mod delete;
+    pub use delete::HostDelete;
+
     pub mod info;
+    pub use info::HostInfo;
+
     pub mod update;
+    pub use update::HostUpdate;
 
     pub const XMLNS: &str = "urn:ietf:params:xml:ns:host-1.0";
 }
 
 pub mod message {
     pub mod ack;
+    pub use ack::MessageAck;
+
     pub mod poll;
+    pub use poll::MessagePoll;
 }
 
 pub use client::EppClient;