diff --git a/.drone.yml b/.drone.yml
index 2cb2a2d..3116267 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -78,10 +78,6 @@ steps:
       - export CARGO_HOME=/tmp/cargo/$CACHE_DIR
       - export CARGO_TARGET_DIR=/tmp/cargo-target/$CACHE_DIR
       - mkdir -p $CARGO_HOME $CARGO_TARGET_DIR
-      - cd epp-client
-      - cargo publish --token $CARGO_TOKEN
-      - cd ..
-      - cd epp-client-macros
       - cargo publish --token $CARGO_TOKEN
     when:
       branch:
diff --git a/Cargo.toml b/Cargo.toml
index ed16729..7601057 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,2 +1,24 @@
-[workspace]
-members = ['epp-client']
+[package]
+name = "epp-client"
+version = "0.3.1"
+edition = "2018"
+license = "MIT"
+authors = ["Ritesh Chitlangi <ritesh@ayravat.com>"]
+description = "EPP (Extensible Provisioning Protocol) Client Library for Domain Registration and Management"
+repository = "https://github.com/masalachai/epp-client"
+
+[dependencies]
+celes = "2.1"
+chrono = "0.4"
+quick-xml = { version = "0.22", features = [ "serialize" ] }
+rustls = "0.20"
+rustls-pemfile = "0.2"
+serde = { version = "1.0", features = ["derive"] }
+tokio = { version = "1.0", features = [ "full" ] }
+tokio-rustls = "0.23"
+tracing = "0.1.29"
+webpki-roots = "0.22.1"
+
+[dev-dependencies]
+tokio-test = "0.4"
+regex = "1.5"
diff --git a/epp-client/Cargo.toml b/epp-client/Cargo.toml
deleted file mode 100644
index 7601057..0000000
--- a/epp-client/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-name = "epp-client"
-version = "0.3.1"
-edition = "2018"
-license = "MIT"
-authors = ["Ritesh Chitlangi <ritesh@ayravat.com>"]
-description = "EPP (Extensible Provisioning Protocol) Client Library for Domain Registration and Management"
-repository = "https://github.com/masalachai/epp-client"
-
-[dependencies]
-celes = "2.1"
-chrono = "0.4"
-quick-xml = { version = "0.22", features = [ "serialize" ] }
-rustls = "0.20"
-rustls-pemfile = "0.2"
-serde = { version = "1.0", features = ["derive"] }
-tokio = { version = "1.0", features = [ "full" ] }
-tokio-rustls = "0.23"
-tracing = "0.1.29"
-webpki-roots = "0.22.1"
-
-[dev-dependencies]
-tokio-test = "0.4"
-regex = "1.5"
diff --git a/epp-client/README.md b/epp-client/README.md
deleted file mode 100644
index 54159f8..0000000
--- a/epp-client/README.md
+++ /dev/null
@@ -1,144 +0,0 @@
-# EPP (Extensible Provisioning Protocol) Library for Domain Registration and Management
-
-[![Build](https://ci.masalachai.net/api/badges/masalachai/epp-client/status.svg)](https://ci.masalachai.net/masalachai/epp-client)
-[![Documentation](https://docs.rs/epp-client/badge.svg)](https://docs.rs/epp-client/)
-
-## Description
-
-epp-client is a client library written in Rust for Internet domain registration
-and management for domain registrars.
-
-It supports the following basic Domain, Contact, Host, and Message management
-calls, with plans to add more calls and other EPP extensions in the future, and
-to eventually be RFC compliant with the EPP protocol.
-
-- Domain Check
-- Domain Create
-- Domain Info
-- Domain Update
-- Domain Delete
-- Domain Renew
-- Domain Transfer
-
-- Contact Check
-- Contact Create
-- Contact Info
-- Contact Update
-- Contact Delete
-
-- Host Check
-- Host Create
-- Host Info
-- Host Update
-- Host Delete
-
-- Message Poll
-- Message Ack
-
-- RGP Restore Request
-- RGP Restore Report
-
-## Usage
-
-Just add the following to your project's `Cargo.toml`
-
-```toml
-epp-client = "0.3"
-```
-
-## Operation
-
-You can create a mut variable of type `EppClient` with the domain registry config.
-
-```rust
-use std::collections::HashMap;
-
-use epp_client::config::{EppClientConfig, RegistryConfig};
-use epp_client::EppClient;
-use epp_client::domain::check::DomainCheck;
-use epp_client::common::NoExtension;
-use epp_client::login::Login;
-use epp_client::logout::Logout;
-
-#[tokio::main]
-async fn main() {
-    // Configure the client to connect to one of more registries
-    let mut registry: HashMap<String, RegistryConfig> = HashMap::new();
-    registry.insert(
-        "registry_name".to_owned(),
-        RegistryConfig {
-            host: "example.com".to_owned(),
-            port: 700,
-            tls_files: None,
-        },
-    );
-    let config = EppClientConfig { registry };
-
-    // Create an instance of EppClient, passing the config and the registry you want to connect to
-    let mut client = match EppClient::new(&config, "registry_name").await {
-        Ok(client) => client,
-        Err(e) => panic!("Failed to create EppClient: {}",  e)
-    };
-
-    let login = Login::<NoExtension>::new("username", "password", None);
-    client.transact(login, "transaction-id").await.unwrap();
-
-    // Create an DomainCheck instance
-    let domain_check = DomainCheck::<NoExtension>::new(
-        vec!["eppdev-100.com", "eppdev-100.net"],
-    );
-
-    // send it to the registry and receive a response of type EppDomainCheckResponse
-    let response = client.transact(domain_check, "transaction-id").await.unwrap();
-
-    println!("{:?}", response);
-
-    let logout = Logout::<NoExtension>::new();
-    client.transact(logout, "transaction-id").await.unwrap();
-}
-```
-
-The output would look similar to the following:
-
-```
-Domain: eppdev.com, Available: 1
-Domain: eppdev.net, Available: 1
-```
-
-You may also choose to store your configuration in something like a toml file:
-
-```toml
-[registry.verisign]
-host = 'epp.verisign-grs.com'
-port = 700
-username = 'username'
-password = 'password'
-# service extensions
-ext_uris = []
-
-[registry.verisign.tls_files]
-# the full client certificate chain in PEM format
-cert_chain = '/path/to/certificate/chain/pemfile'
-# the RSA private key for your certificate
-key = '/path/to/private/key/pemfile'
-```
-
-```rust
-use epp_client::config::{EppClientConfig};
-
-#[tokio::main]
-async fn main() {
-    // parse EppClientConfig from toml file
-    let config_path = Path::new("../secrets/epp-client.toml");
-    let config: EppClientConfig =
-        toml::from_str(&fs::read_to_string(config_path).await.unwrap()).unwrap();
-}
-```
-
-## Request
-
-Currently I don't have access to a registry's OT&E account to do extensive
-testing. I am using
-[hexonet's EPP Gateway](https://wiki.hexonet.net/wiki/EPP_Gateway) for testing,
-but access to a registry's OT&E account would be very helpful, so if anyone
-could help me out with one I would be very grateful!
diff --git a/epp-client/src/client.rs b/src/client.rs
similarity index 100%
rename from epp-client/src/client.rs
rename to src/client.rs
diff --git a/epp-client/src/common.rs b/src/common.rs
similarity index 100%
rename from epp-client/src/common.rs
rename to src/common.rs
diff --git a/epp-client/src/config.rs b/src/config.rs
similarity index 100%
rename from epp-client/src/config.rs
rename to src/config.rs
diff --git a/epp-client/src/contact/check.rs b/src/contact/check.rs
similarity index 100%
rename from epp-client/src/contact/check.rs
rename to src/contact/check.rs
diff --git a/epp-client/src/contact/create.rs b/src/contact/create.rs
similarity index 100%
rename from epp-client/src/contact/create.rs
rename to src/contact/create.rs
diff --git a/epp-client/src/contact/delete.rs b/src/contact/delete.rs
similarity index 100%
rename from epp-client/src/contact/delete.rs
rename to src/contact/delete.rs
diff --git a/epp-client/src/contact/info.rs b/src/contact/info.rs
similarity index 100%
rename from epp-client/src/contact/info.rs
rename to src/contact/info.rs
diff --git a/epp-client/src/contact/update.rs b/src/contact/update.rs
similarity index 100%
rename from epp-client/src/contact/update.rs
rename to src/contact/update.rs
diff --git a/epp-client/src/domain/check.rs b/src/domain/check.rs
similarity index 100%
rename from epp-client/src/domain/check.rs
rename to src/domain/check.rs
diff --git a/epp-client/src/domain/create.rs b/src/domain/create.rs
similarity index 100%
rename from epp-client/src/domain/create.rs
rename to src/domain/create.rs
diff --git a/epp-client/src/domain/delete.rs b/src/domain/delete.rs
similarity index 100%
rename from epp-client/src/domain/delete.rs
rename to src/domain/delete.rs
diff --git a/epp-client/src/domain/info.rs b/src/domain/info.rs
similarity index 100%
rename from epp-client/src/domain/info.rs
rename to src/domain/info.rs
diff --git a/epp-client/src/domain/renew.rs b/src/domain/renew.rs
similarity index 100%
rename from epp-client/src/domain/renew.rs
rename to src/domain/renew.rs
diff --git a/epp-client/src/domain/transfer.rs b/src/domain/transfer.rs
similarity index 100%
rename from epp-client/src/domain/transfer.rs
rename to src/domain/transfer.rs
diff --git a/epp-client/src/domain/update.rs b/src/domain/update.rs
similarity index 100%
rename from epp-client/src/domain/update.rs
rename to src/domain/update.rs
diff --git a/epp-client/src/error.rs b/src/error.rs
similarity index 100%
rename from epp-client/src/error.rs
rename to src/error.rs
diff --git a/epp-client/src/extensions/consolidate.rs b/src/extensions/consolidate.rs
similarity index 100%
rename from epp-client/src/extensions/consolidate.rs
rename to src/extensions/consolidate.rs
diff --git a/epp-client/src/extensions/namestore.rs b/src/extensions/namestore.rs
similarity index 100%
rename from epp-client/src/extensions/namestore.rs
rename to src/extensions/namestore.rs
diff --git a/epp-client/src/extensions/rgp.rs b/src/extensions/rgp.rs
similarity index 100%
rename from epp-client/src/extensions/rgp.rs
rename to src/extensions/rgp.rs
diff --git a/epp-client/src/extensions/rgp/report.rs b/src/extensions/rgp/report.rs
similarity index 100%
rename from epp-client/src/extensions/rgp/report.rs
rename to src/extensions/rgp/report.rs
diff --git a/epp-client/src/extensions/rgp/request.rs b/src/extensions/rgp/request.rs
similarity index 100%
rename from epp-client/src/extensions/rgp/request.rs
rename to src/extensions/rgp/request.rs
diff --git a/epp-client/src/hello.rs b/src/hello.rs
similarity index 100%
rename from epp-client/src/hello.rs
rename to src/hello.rs
diff --git a/epp-client/src/host/check.rs b/src/host/check.rs
similarity index 100%
rename from epp-client/src/host/check.rs
rename to src/host/check.rs
diff --git a/epp-client/src/host/create.rs b/src/host/create.rs
similarity index 100%
rename from epp-client/src/host/create.rs
rename to src/host/create.rs
diff --git a/epp-client/src/host/delete.rs b/src/host/delete.rs
similarity index 100%
rename from epp-client/src/host/delete.rs
rename to src/host/delete.rs
diff --git a/epp-client/src/host/info.rs b/src/host/info.rs
similarity index 100%
rename from epp-client/src/host/info.rs
rename to src/host/info.rs
diff --git a/epp-client/src/host/update.rs b/src/host/update.rs
similarity index 100%
rename from epp-client/src/host/update.rs
rename to src/host/update.rs
diff --git a/epp-client/src/lib.rs b/src/lib.rs
similarity index 100%
rename from epp-client/src/lib.rs
rename to src/lib.rs
diff --git a/epp-client/src/login.rs b/src/login.rs
similarity index 100%
rename from epp-client/src/login.rs
rename to src/login.rs
diff --git a/epp-client/src/logout.rs b/src/logout.rs
similarity index 100%
rename from epp-client/src/logout.rs
rename to src/logout.rs
diff --git a/epp-client/src/message/ack.rs b/src/message/ack.rs
similarity index 100%
rename from epp-client/src/message/ack.rs
rename to src/message/ack.rs
diff --git a/epp-client/src/message/poll.rs b/src/message/poll.rs
similarity index 100%
rename from epp-client/src/message/poll.rs
rename to src/message/poll.rs
diff --git a/epp-client/src/registry.rs b/src/registry.rs
similarity index 100%
rename from epp-client/src/registry.rs
rename to src/registry.rs
diff --git a/epp-client/src/request.rs b/src/request.rs
similarity index 100%
rename from epp-client/src/request.rs
rename to src/request.rs
diff --git a/epp-client/src/response.rs b/src/response.rs
similarity index 100%
rename from epp-client/src/response.rs
rename to src/response.rs
diff --git a/epp-client/src/tests/mod.rs b/src/tests/mod.rs
similarity index 100%
rename from epp-client/src/tests/mod.rs
rename to src/tests/mod.rs
diff --git a/epp-client/src/xml.rs b/src/xml.rs
similarity index 100%
rename from epp-client/src/xml.rs
rename to src/xml.rs
diff --git a/epp-client/test/resources/request/contact/check.xml b/test/resources/request/contact/check.xml
similarity index 100%
rename from epp-client/test/resources/request/contact/check.xml
rename to test/resources/request/contact/check.xml
diff --git a/epp-client/test/resources/request/contact/create.xml b/test/resources/request/contact/create.xml
similarity index 100%
rename from epp-client/test/resources/request/contact/create.xml
rename to test/resources/request/contact/create.xml
diff --git a/epp-client/test/resources/request/contact/delete.xml b/test/resources/request/contact/delete.xml
similarity index 100%
rename from epp-client/test/resources/request/contact/delete.xml
rename to test/resources/request/contact/delete.xml
diff --git a/epp-client/test/resources/request/contact/info.xml b/test/resources/request/contact/info.xml
similarity index 100%
rename from epp-client/test/resources/request/contact/info.xml
rename to test/resources/request/contact/info.xml
diff --git a/epp-client/test/resources/request/contact/update.xml b/test/resources/request/contact/update.xml
similarity index 100%
rename from epp-client/test/resources/request/contact/update.xml
rename to test/resources/request/contact/update.xml
diff --git a/epp-client/test/resources/request/domain/check.xml b/test/resources/request/domain/check.xml
similarity index 100%
rename from epp-client/test/resources/request/domain/check.xml
rename to test/resources/request/domain/check.xml
diff --git a/epp-client/test/resources/request/domain/create.xml b/test/resources/request/domain/create.xml
similarity index 100%
rename from epp-client/test/resources/request/domain/create.xml
rename to test/resources/request/domain/create.xml
diff --git a/epp-client/test/resources/request/domain/create_with_host_attr.xml b/test/resources/request/domain/create_with_host_attr.xml
similarity index 100%
rename from epp-client/test/resources/request/domain/create_with_host_attr.xml
rename to test/resources/request/domain/create_with_host_attr.xml
diff --git a/epp-client/test/resources/request/domain/create_with_host_obj.xml b/test/resources/request/domain/create_with_host_obj.xml
similarity index 100%
rename from epp-client/test/resources/request/domain/create_with_host_obj.xml
rename to test/resources/request/domain/create_with_host_obj.xml
diff --git a/epp-client/test/resources/request/domain/delete.xml b/test/resources/request/domain/delete.xml
similarity index 100%
rename from epp-client/test/resources/request/domain/delete.xml
rename to test/resources/request/domain/delete.xml
diff --git a/epp-client/test/resources/request/domain/info.xml b/test/resources/request/domain/info.xml
similarity index 100%
rename from epp-client/test/resources/request/domain/info.xml
rename to test/resources/request/domain/info.xml
diff --git a/epp-client/test/resources/request/domain/renew.xml b/test/resources/request/domain/renew.xml
similarity index 100%
rename from epp-client/test/resources/request/domain/renew.xml
rename to test/resources/request/domain/renew.xml
diff --git a/epp-client/test/resources/request/domain/transfer_approve.xml b/test/resources/request/domain/transfer_approve.xml
similarity index 100%
rename from epp-client/test/resources/request/domain/transfer_approve.xml
rename to test/resources/request/domain/transfer_approve.xml
diff --git a/epp-client/test/resources/request/domain/transfer_cancel.xml b/test/resources/request/domain/transfer_cancel.xml
similarity index 100%
rename from epp-client/test/resources/request/domain/transfer_cancel.xml
rename to test/resources/request/domain/transfer_cancel.xml
diff --git a/epp-client/test/resources/request/domain/transfer_query.xml b/test/resources/request/domain/transfer_query.xml
similarity index 100%
rename from epp-client/test/resources/request/domain/transfer_query.xml
rename to test/resources/request/domain/transfer_query.xml
diff --git a/epp-client/test/resources/request/domain/transfer_reject.xml b/test/resources/request/domain/transfer_reject.xml
similarity index 100%
rename from epp-client/test/resources/request/domain/transfer_reject.xml
rename to test/resources/request/domain/transfer_reject.xml
diff --git a/epp-client/test/resources/request/domain/transfer_request.xml b/test/resources/request/domain/transfer_request.xml
similarity index 100%
rename from epp-client/test/resources/request/domain/transfer_request.xml
rename to test/resources/request/domain/transfer_request.xml
diff --git a/epp-client/test/resources/request/domain/update.xml b/test/resources/request/domain/update.xml
similarity index 100%
rename from epp-client/test/resources/request/domain/update.xml
rename to test/resources/request/domain/update.xml
diff --git a/epp-client/test/resources/request/extensions/consolidate.xml b/test/resources/request/extensions/consolidate.xml
similarity index 100%
rename from epp-client/test/resources/request/extensions/consolidate.xml
rename to test/resources/request/extensions/consolidate.xml
diff --git a/epp-client/test/resources/request/extensions/namestore.xml b/test/resources/request/extensions/namestore.xml
similarity index 100%
rename from epp-client/test/resources/request/extensions/namestore.xml
rename to test/resources/request/extensions/namestore.xml
diff --git a/epp-client/test/resources/request/extensions/rgp_restore_report.xml b/test/resources/request/extensions/rgp_restore_report.xml
similarity index 100%
rename from epp-client/test/resources/request/extensions/rgp_restore_report.xml
rename to test/resources/request/extensions/rgp_restore_report.xml
diff --git a/epp-client/test/resources/request/extensions/rgp_restore_request.xml b/test/resources/request/extensions/rgp_restore_request.xml
similarity index 100%
rename from epp-client/test/resources/request/extensions/rgp_restore_request.xml
rename to test/resources/request/extensions/rgp_restore_request.xml
diff --git a/epp-client/test/resources/request/hello.xml b/test/resources/request/hello.xml
similarity index 100%
rename from epp-client/test/resources/request/hello.xml
rename to test/resources/request/hello.xml
diff --git a/epp-client/test/resources/request/host/check.xml b/test/resources/request/host/check.xml
similarity index 100%
rename from epp-client/test/resources/request/host/check.xml
rename to test/resources/request/host/check.xml
diff --git a/epp-client/test/resources/request/host/create.xml b/test/resources/request/host/create.xml
similarity index 100%
rename from epp-client/test/resources/request/host/create.xml
rename to test/resources/request/host/create.xml
diff --git a/epp-client/test/resources/request/host/delete.xml b/test/resources/request/host/delete.xml
similarity index 100%
rename from epp-client/test/resources/request/host/delete.xml
rename to test/resources/request/host/delete.xml
diff --git a/epp-client/test/resources/request/host/info.xml b/test/resources/request/host/info.xml
similarity index 100%
rename from epp-client/test/resources/request/host/info.xml
rename to test/resources/request/host/info.xml
diff --git a/epp-client/test/resources/request/host/update.xml b/test/resources/request/host/update.xml
similarity index 100%
rename from epp-client/test/resources/request/host/update.xml
rename to test/resources/request/host/update.xml
diff --git a/epp-client/test/resources/request/login.xml b/test/resources/request/login.xml
similarity index 100%
rename from epp-client/test/resources/request/login.xml
rename to test/resources/request/login.xml
diff --git a/epp-client/test/resources/request/logout.xml b/test/resources/request/logout.xml
similarity index 100%
rename from epp-client/test/resources/request/logout.xml
rename to test/resources/request/logout.xml
diff --git a/epp-client/test/resources/request/message/ack.xml b/test/resources/request/message/ack.xml
similarity index 100%
rename from epp-client/test/resources/request/message/ack.xml
rename to test/resources/request/message/ack.xml
diff --git a/epp-client/test/resources/request/message/poll.xml b/test/resources/request/message/poll.xml
similarity index 100%
rename from epp-client/test/resources/request/message/poll.xml
rename to test/resources/request/message/poll.xml
diff --git a/epp-client/test/resources/response/contact/check.xml b/test/resources/response/contact/check.xml
similarity index 100%
rename from epp-client/test/resources/response/contact/check.xml
rename to test/resources/response/contact/check.xml
diff --git a/epp-client/test/resources/response/contact/create.xml b/test/resources/response/contact/create.xml
similarity index 100%
rename from epp-client/test/resources/response/contact/create.xml
rename to test/resources/response/contact/create.xml
diff --git a/epp-client/test/resources/response/contact/delete.xml b/test/resources/response/contact/delete.xml
similarity index 100%
rename from epp-client/test/resources/response/contact/delete.xml
rename to test/resources/response/contact/delete.xml
diff --git a/epp-client/test/resources/response/contact/info.xml b/test/resources/response/contact/info.xml
similarity index 100%
rename from epp-client/test/resources/response/contact/info.xml
rename to test/resources/response/contact/info.xml
diff --git a/epp-client/test/resources/response/contact/update.xml b/test/resources/response/contact/update.xml
similarity index 100%
rename from epp-client/test/resources/response/contact/update.xml
rename to test/resources/response/contact/update.xml
diff --git a/epp-client/test/resources/response/domain/check.xml b/test/resources/response/domain/check.xml
similarity index 100%
rename from epp-client/test/resources/response/domain/check.xml
rename to test/resources/response/domain/check.xml
diff --git a/epp-client/test/resources/response/domain/create.xml b/test/resources/response/domain/create.xml
similarity index 100%
rename from epp-client/test/resources/response/domain/create.xml
rename to test/resources/response/domain/create.xml
diff --git a/epp-client/test/resources/response/domain/delete.xml b/test/resources/response/domain/delete.xml
similarity index 100%
rename from epp-client/test/resources/response/domain/delete.xml
rename to test/resources/response/domain/delete.xml
diff --git a/epp-client/test/resources/response/domain/info.xml b/test/resources/response/domain/info.xml
similarity index 100%
rename from epp-client/test/resources/response/domain/info.xml
rename to test/resources/response/domain/info.xml
diff --git a/epp-client/test/resources/response/domain/info_alt.xml b/test/resources/response/domain/info_alt.xml
similarity index 100%
rename from epp-client/test/resources/response/domain/info_alt.xml
rename to test/resources/response/domain/info_alt.xml
diff --git a/epp-client/test/resources/response/domain/renew.xml b/test/resources/response/domain/renew.xml
similarity index 100%
rename from epp-client/test/resources/response/domain/renew.xml
rename to test/resources/response/domain/renew.xml
diff --git a/epp-client/test/resources/response/domain/transfer_approve.xml b/test/resources/response/domain/transfer_approve.xml
similarity index 100%
rename from epp-client/test/resources/response/domain/transfer_approve.xml
rename to test/resources/response/domain/transfer_approve.xml
diff --git a/epp-client/test/resources/response/domain/transfer_cancel.xml b/test/resources/response/domain/transfer_cancel.xml
similarity index 100%
rename from epp-client/test/resources/response/domain/transfer_cancel.xml
rename to test/resources/response/domain/transfer_cancel.xml
diff --git a/epp-client/test/resources/response/domain/transfer_query.xml b/test/resources/response/domain/transfer_query.xml
similarity index 100%
rename from epp-client/test/resources/response/domain/transfer_query.xml
rename to test/resources/response/domain/transfer_query.xml
diff --git a/epp-client/test/resources/response/domain/transfer_reject.xml b/test/resources/response/domain/transfer_reject.xml
similarity index 100%
rename from epp-client/test/resources/response/domain/transfer_reject.xml
rename to test/resources/response/domain/transfer_reject.xml
diff --git a/epp-client/test/resources/response/domain/transfer_request.xml b/test/resources/response/domain/transfer_request.xml
similarity index 100%
rename from epp-client/test/resources/response/domain/transfer_request.xml
rename to test/resources/response/domain/transfer_request.xml
diff --git a/epp-client/test/resources/response/domain/update.xml b/test/resources/response/domain/update.xml
similarity index 100%
rename from epp-client/test/resources/response/domain/update.xml
rename to test/resources/response/domain/update.xml
diff --git a/epp-client/test/resources/response/error.xml b/test/resources/response/error.xml
similarity index 100%
rename from epp-client/test/resources/response/error.xml
rename to test/resources/response/error.xml
diff --git a/epp-client/test/resources/response/extensions/domain_info_rgp.xml b/test/resources/response/extensions/domain_info_rgp.xml
similarity index 100%
rename from epp-client/test/resources/response/extensions/domain_info_rgp.xml
rename to test/resources/response/extensions/domain_info_rgp.xml
diff --git a/epp-client/test/resources/response/extensions/namestore.xml b/test/resources/response/extensions/namestore.xml
similarity index 100%
rename from epp-client/test/resources/response/extensions/namestore.xml
rename to test/resources/response/extensions/namestore.xml
diff --git a/epp-client/test/resources/response/extensions/rgp_restore.xml b/test/resources/response/extensions/rgp_restore.xml
similarity index 100%
rename from epp-client/test/resources/response/extensions/rgp_restore.xml
rename to test/resources/response/extensions/rgp_restore.xml
diff --git a/epp-client/test/resources/response/greeting.xml b/test/resources/response/greeting.xml
similarity index 100%
rename from epp-client/test/resources/response/greeting.xml
rename to test/resources/response/greeting.xml
diff --git a/epp-client/test/resources/response/host/check.xml b/test/resources/response/host/check.xml
similarity index 100%
rename from epp-client/test/resources/response/host/check.xml
rename to test/resources/response/host/check.xml
diff --git a/epp-client/test/resources/response/host/create.xml b/test/resources/response/host/create.xml
similarity index 100%
rename from epp-client/test/resources/response/host/create.xml
rename to test/resources/response/host/create.xml
diff --git a/epp-client/test/resources/response/host/delete.xml b/test/resources/response/host/delete.xml
similarity index 100%
rename from epp-client/test/resources/response/host/delete.xml
rename to test/resources/response/host/delete.xml
diff --git a/epp-client/test/resources/response/host/info.xml b/test/resources/response/host/info.xml
similarity index 100%
rename from epp-client/test/resources/response/host/info.xml
rename to test/resources/response/host/info.xml
diff --git a/epp-client/test/resources/response/host/update.xml b/test/resources/response/host/update.xml
similarity index 100%
rename from epp-client/test/resources/response/host/update.xml
rename to test/resources/response/host/update.xml
diff --git a/epp-client/test/resources/response/login.xml b/test/resources/response/login.xml
similarity index 100%
rename from epp-client/test/resources/response/login.xml
rename to test/resources/response/login.xml
diff --git a/epp-client/test/resources/response/logout.xml b/test/resources/response/logout.xml
similarity index 100%
rename from epp-client/test/resources/response/logout.xml
rename to test/resources/response/logout.xml
diff --git a/epp-client/test/resources/response/message/ack.xml b/test/resources/response/message/ack.xml
similarity index 100%
rename from epp-client/test/resources/response/message/ack.xml
rename to test/resources/response/message/ack.xml
diff --git a/epp-client/test/resources/response/message/poll.xml b/test/resources/response/message/poll.xml
similarity index 100%
rename from epp-client/test/resources/response/message/poll.xml
rename to test/resources/response/message/poll.xml