diff --git a/epp-client/src/domain/rgp.rs b/epp-client/src/extensions/rgp.rs
similarity index 100%
rename from epp-client/src/domain/rgp.rs
rename to epp-client/src/extensions/rgp.rs
diff --git a/epp-client/src/domain/rgp/report.rs b/epp-client/src/extensions/rgp/report.rs
similarity index 98%
rename from epp-client/src/domain/rgp/report.rs
rename to epp-client/src/extensions/rgp/report.rs
index 5aa3897..4192c8b 100644
--- a/epp-client/src/domain/rgp/report.rs
+++ b/epp-client/src/extensions/rgp/report.rs
@@ -3,11 +3,12 @@
 use epp_client_macros::*;
 
 use crate::common::{ElementName, NoExtension, StringValue};
-use crate::domain::rgp::EPP_DOMAIN_RGP_EXT_XMLNS;
 use crate::request::EppExtension;
 use chrono::{DateTime, SecondsFormat, Utc};
 use serde::{Deserialize, Serialize};
 
+use super::EPP_DOMAIN_RGP_EXT_XMLNS;
+
 /// Type that represents the domain rgp restore report extension
 ///
 /// ## Usage
@@ -18,7 +19,7 @@ use serde::{Deserialize, Serialize};
 /// use epp_client::config::{EppClientConfig, RegistryConfig};
 /// use epp_client::EppClient;
 /// use epp_client::common::{DomainStatus, DomainContact};
-/// use epp_client::domain::rgp::report::RgpRestoreReport;
+/// use epp_client::extensions::rgp::report::RgpRestoreReport;
 /// use epp_client::domain::update::DomainUpdate;
 /// use epp_client::generate_client_tr_id;
 /// use epp_client::common::NoExtension;
diff --git a/epp-client/src/domain/rgp/request.rs b/epp-client/src/extensions/rgp/request.rs
similarity index 97%
rename from epp-client/src/domain/rgp/request.rs
rename to epp-client/src/extensions/rgp/request.rs
index 4ed1bc2..7e83f6a 100644
--- a/epp-client/src/domain/rgp/request.rs
+++ b/epp-client/src/extensions/rgp/request.rs
@@ -3,12 +3,13 @@
 use epp_client_macros::*;
 
 use crate::common::ElementName;
-use crate::domain::rgp::EPP_DOMAIN_RGP_EXT_XMLNS;
 
 use crate::request::EppExtension;
 
 use serde::{Deserialize, Serialize};
 
+use super::EPP_DOMAIN_RGP_EXT_XMLNS;
+
 /// Type that represents the <epp> request for a domain rgp restore request command
 ///
 /// ## Usage
@@ -18,7 +19,7 @@ use serde::{Deserialize, Serialize};
 ///
 /// use epp_client::config::{EppClientConfig, RegistryConfig};
 /// use epp_client::EppClient;
-/// use epp_client::domain::rgp::request::RgpRestoreRequest;
+/// use epp_client::extensions::rgp::request::RgpRestoreRequest;
 /// use epp_client::domain::update::DomainUpdate;
 /// use epp_client::generate_client_tr_id;
 ///
diff --git a/epp-client/src/lib.rs b/epp-client/src/lib.rs
index 7bc3c89..58eb2ad 100644
--- a/epp-client/src/lib.rs
+++ b/epp-client/src/lib.rs
@@ -128,13 +128,16 @@ pub mod domain {
     pub mod delete;
     pub mod info;
     pub mod renew;
-    pub mod rgp;
     pub mod transfer;
     pub mod update;
 
     pub const XMLNS: &str = "urn:ietf:params:xml:ns:domain-1.0";
 }
 
+pub mod extensions {
+    pub mod rgp;
+}
+
 pub mod host {
     pub mod check;
     pub mod create;
diff --git a/epp-client/src/tests/de.rs b/epp-client/src/tests/de.rs
index 75772b2..db9da1f 100644
--- a/epp-client/src/tests/de.rs
+++ b/epp-client/src/tests/de.rs
@@ -14,13 +14,13 @@ mod response {
     use crate::domain::delete::DomainDelete;
     use crate::domain::info::DomainInfo;
     use crate::domain::renew::DomainRenew;
-    use crate::domain::rgp::request::RgpRestoreRequest;
     use crate::domain::transfer::DomainTransferApprove;
     use crate::domain::transfer::DomainTransferCancel;
     use crate::domain::transfer::DomainTransferQuery;
     use crate::domain::transfer::DomainTransferReject;
     use crate::domain::transfer::DomainTransferRequest;
     use crate::domain::update::DomainUpdate;
+    use crate::extensions::rgp::request::RgpRestoreRequest;
     use crate::hello::ExpiryType;
     use crate::hello::Greeting;
     use crate::hello::Relative;
diff --git a/epp-client/src/tests/se.rs b/epp-client/src/tests/se.rs
index a084d6a..8cb5626 100644
--- a/epp-client/src/tests/se.rs
+++ b/epp-client/src/tests/se.rs
@@ -21,8 +21,6 @@ mod request {
     use crate::domain::delete::DomainDelete;
     use crate::domain::info::DomainInfo;
     use crate::domain::renew::DomainRenew;
-    use crate::domain::rgp::report::RgpRestoreReport;
-    use crate::domain::rgp::request::RgpRestoreRequest;
     use crate::domain::transfer::DomainTransferApprove;
     use crate::domain::transfer::DomainTransferCancel;
     use crate::domain::transfer::DomainTransferQuery;
@@ -31,6 +29,8 @@ mod request {
     use crate::domain::update::DomainAddRemove;
     use crate::domain::update::DomainChangeInfo;
     use crate::domain::update::DomainUpdate;
+    use crate::extensions::rgp::report::RgpRestoreReport;
+    use crate::extensions::rgp::request::RgpRestoreRequest;
     use crate::hello::Hello;
     use crate::host::check::HostCheck;
     use crate::host::create::HostCreate;