diff --git a/idevice/src/lib.rs b/idevice/src/lib.rs
index 481572c..de98071 100644
--- a/idevice/src/lib.rs
+++ b/idevice/src/lib.rs
@@ -1,36 +1,11 @@
 #![doc = include_str!("../README.md")]
 // Jackson Coxson
 
-#[cfg(feature = "afc")]
-pub mod afc;
-#[cfg(feature = "amfi")]
-pub mod amfi;
 #[cfg(feature = "pair")]
 mod ca;
-#[cfg(feature = "core_device_proxy")]
-pub mod core_device_proxy;
-#[cfg(feature = "crashreportcopymobile")]
-pub mod crashreportcopymobile;
-#[cfg(feature = "debug_proxy")]
-pub mod debug_proxy;
-#[cfg(feature = "dvt")]
-pub mod dvt;
-#[cfg(feature = "heartbeat")]
-pub mod heartbeat;
-#[cfg(feature = "xpc")]
-mod http2;
-#[cfg(feature = "installation_proxy")]
-pub mod installation_proxy;
-pub mod lockdown;
-#[cfg(feature = "misagent")]
-pub mod misagent;
-#[cfg(feature = "mobile_image_mounter")]
-pub mod mobile_image_mounter;
 pub mod pairing_file;
 pub mod provider;
 mod sni;
-#[cfg(feature = "springboardservices")]
-pub mod springboardservices;
 #[cfg(feature = "tunnel_tcp_stack")]
 pub mod tcp;
 #[cfg(feature = "tss")]
@@ -40,8 +15,9 @@ pub mod tunneld;
 #[cfg(feature = "usbmuxd")]
 pub mod usbmuxd;
 mod util;
-#[cfg(feature = "xpc")]
-pub mod xpc;
+
+pub mod services;
+pub use services::*;
 
 use log::{debug, error, trace};
 use provider::IdeviceProvider;
diff --git a/idevice/src/afc/errors.rs b/idevice/src/services/afc/errors.rs
similarity index 100%
rename from idevice/src/afc/errors.rs
rename to idevice/src/services/afc/errors.rs
diff --git a/idevice/src/afc/file.rs b/idevice/src/services/afc/file.rs
similarity index 100%
rename from idevice/src/afc/file.rs
rename to idevice/src/services/afc/file.rs
diff --git a/idevice/src/afc/mod.rs b/idevice/src/services/afc/mod.rs
similarity index 100%
rename from idevice/src/afc/mod.rs
rename to idevice/src/services/afc/mod.rs
diff --git a/idevice/src/afc/opcode.rs b/idevice/src/services/afc/opcode.rs
similarity index 100%
rename from idevice/src/afc/opcode.rs
rename to idevice/src/services/afc/opcode.rs
diff --git a/idevice/src/afc/packet.rs b/idevice/src/services/afc/packet.rs
similarity index 100%
rename from idevice/src/afc/packet.rs
rename to idevice/src/services/afc/packet.rs
diff --git a/idevice/src/amfi.rs b/idevice/src/services/amfi.rs
similarity index 100%
rename from idevice/src/amfi.rs
rename to idevice/src/services/amfi.rs
diff --git a/idevice/src/core_device_proxy/mod.rs b/idevice/src/services/core_device_proxy.rs
similarity index 100%
rename from idevice/src/core_device_proxy/mod.rs
rename to idevice/src/services/core_device_proxy.rs
diff --git a/idevice/src/crashreportcopymobile.rs b/idevice/src/services/crashreportcopymobile.rs
similarity index 100%
rename from idevice/src/crashreportcopymobile.rs
rename to idevice/src/services/crashreportcopymobile.rs
diff --git a/idevice/src/debug_proxy.rs b/idevice/src/services/debug_proxy.rs
similarity index 100%
rename from idevice/src/debug_proxy.rs
rename to idevice/src/services/debug_proxy.rs
diff --git a/idevice/src/dvt/location_simulation.rs b/idevice/src/services/dvt/location_simulation.rs
similarity index 100%
rename from idevice/src/dvt/location_simulation.rs
rename to idevice/src/services/dvt/location_simulation.rs
diff --git a/idevice/src/dvt/message.rs b/idevice/src/services/dvt/message.rs
similarity index 100%
rename from idevice/src/dvt/message.rs
rename to idevice/src/services/dvt/message.rs
diff --git a/idevice/src/dvt/mod.rs b/idevice/src/services/dvt/mod.rs
similarity index 100%
rename from idevice/src/dvt/mod.rs
rename to idevice/src/services/dvt/mod.rs
diff --git a/idevice/src/dvt/process_control.rs b/idevice/src/services/dvt/process_control.rs
similarity index 100%
rename from idevice/src/dvt/process_control.rs
rename to idevice/src/services/dvt/process_control.rs
diff --git a/idevice/src/dvt/remote_server.rs b/idevice/src/services/dvt/remote_server.rs
similarity index 100%
rename from idevice/src/dvt/remote_server.rs
rename to idevice/src/services/dvt/remote_server.rs
diff --git a/idevice/src/heartbeat.rs b/idevice/src/services/heartbeat.rs
similarity index 100%
rename from idevice/src/heartbeat.rs
rename to idevice/src/services/heartbeat.rs
diff --git a/idevice/src/installation_proxy.rs b/idevice/src/services/installation_proxy.rs
similarity index 100%
rename from idevice/src/installation_proxy.rs
rename to idevice/src/services/installation_proxy.rs
diff --git a/idevice/src/lockdown.rs b/idevice/src/services/lockdown.rs
similarity index 100%
rename from idevice/src/lockdown.rs
rename to idevice/src/services/lockdown.rs
diff --git a/idevice/src/misagent.rs b/idevice/src/services/misagent.rs
similarity index 100%
rename from idevice/src/misagent.rs
rename to idevice/src/services/misagent.rs
diff --git a/idevice/src/mobile_image_mounter.rs b/idevice/src/services/mobile_image_mounter.rs
similarity index 100%
rename from idevice/src/mobile_image_mounter.rs
rename to idevice/src/services/mobile_image_mounter.rs
diff --git a/idevice/src/services/mod.rs b/idevice/src/services/mod.rs
new file mode 100644
index 0000000..8217382
--- /dev/null
+++ b/idevice/src/services/mod.rs
@@ -0,0 +1,25 @@
+#[cfg(feature = "afc")]
+pub mod afc;
+#[cfg(feature = "amfi")]
+pub mod amfi;
+#[cfg(feature = "core_device_proxy")]
+pub mod core_device_proxy;
+#[cfg(feature = "crashreportcopymobile")]
+pub mod crashreportcopymobile;
+#[cfg(feature = "debug_proxy")]
+pub mod debug_proxy;
+#[cfg(feature = "dvt")]
+pub mod dvt;
+#[cfg(feature = "heartbeat")]
+pub mod heartbeat;
+#[cfg(feature = "installation_proxy")]
+pub mod installation_proxy;
+pub mod lockdown;
+#[cfg(feature = "misagent")]
+pub mod misagent;
+#[cfg(feature = "mobile_image_mounter")]
+pub mod mobile_image_mounter;
+#[cfg(feature = "springboardservices")]
+pub mod springboardservices;
+#[cfg(feature = "xpc")]
+pub mod xpc;
diff --git a/idevice/src/springboardservices.rs b/idevice/src/services/springboardservices.rs
similarity index 100%
rename from idevice/src/springboardservices.rs
rename to idevice/src/services/springboardservices.rs
diff --git a/idevice/src/xpc/error.rs b/idevice/src/services/xpc/error.rs
similarity index 98%
rename from idevice/src/xpc/error.rs
rename to idevice/src/services/xpc/error.rs
index 85f89e3..96d3ba5 100644
--- a/idevice/src/xpc/error.rs
+++ b/idevice/src/services/xpc/error.rs
@@ -1,6 +1,6 @@
 // DebianArch
 
-use crate::http2::error::Http2Error;
+use super::http2::error::Http2Error;
 use std::{
     array::TryFromSliceError, error::Error, ffi::FromVecWithNulError, io, num::TryFromIntError,
     str::Utf8Error,
diff --git a/idevice/src/xpc/format.rs b/idevice/src/services/xpc/format.rs
similarity index 100%
rename from idevice/src/xpc/format.rs
rename to idevice/src/services/xpc/format.rs
diff --git a/idevice/src/http2/error.rs b/idevice/src/services/xpc/http2/error.rs
similarity index 100%
rename from idevice/src/http2/error.rs
rename to idevice/src/services/xpc/http2/error.rs
diff --git a/idevice/src/http2/h2.rs b/idevice/src/services/xpc/http2/h2.rs
similarity index 100%
rename from idevice/src/http2/h2.rs
rename to idevice/src/services/xpc/http2/h2.rs
diff --git a/idevice/src/http2/mod.rs b/idevice/src/services/xpc/http2/mod.rs
similarity index 100%
rename from idevice/src/http2/mod.rs
rename to idevice/src/services/xpc/http2/mod.rs
diff --git a/idevice/src/xpc/mod.rs b/idevice/src/services/xpc/mod.rs
similarity index 98%
rename from idevice/src/xpc/mod.rs
rename to idevice/src/services/xpc/mod.rs
index ca3c1cc..b84fb58 100644
--- a/idevice/src/xpc/mod.rs
+++ b/idevice/src/services/xpc/mod.rs
@@ -4,16 +4,12 @@
 //! which is used for inter-process communication between iOS/macOS components.
 
 use std::collections::HashMap;
+mod http2;
 
-use crate::{
-    http2::{
-        self,
-        h2::{SettingsFrame, WindowUpdateFrame},
-    },
-    IdeviceError, ReadWrite,
-};
+use crate::{IdeviceError, ReadWrite};
 use error::XPCError;
 use format::{XPCFlag, XPCMessage, XPCObject};
+use http2::h2::{SettingsFrame, WindowUpdateFrame};
 use log::{debug, warn};
 use serde::Deserialize;
 
@@ -292,4 +288,3 @@ impl<R: ReadWrite> XPCConnection<R> {
         }
     }
 }
-