diff --git a/Cargo.lock b/Cargo.lock
index 6fa69a0e..f9534a67 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2043,10 +2043,8 @@ dependencies = [
  "ironrdp-server",
  "ironrdp-session",
  "ironrdp-svc",
- "ironrdp-tls",
  "pico-args",
  "rand",
- "tokio",
  "tokio-rustls",
  "tracing",
  "tracing-subscriber",
diff --git a/crates/ironrdp-client/Cargo.toml b/crates/ironrdp-client/Cargo.toml
index ac2e0e07..315c6ae8 100644
--- a/crates/ironrdp-client/Cargo.toml
+++ b/crates/ironrdp-client/Cargo.toml
@@ -29,6 +29,7 @@ native-tls = ["ironrdp-tls/native-tls"]
 
 # Protocols
 ironrdp = { workspace = true, features = [
+    "session",
     "input",
     "graphics",
     "dvc",
diff --git a/crates/ironrdp-web/Cargo.toml b/crates/ironrdp-web/Cargo.toml
index f5964a49..541f0e48 100644
--- a/crates/ironrdp-web/Cargo.toml
+++ b/crates/ironrdp-web/Cargo.toml
@@ -25,6 +25,8 @@ panic_hook = ["dep:console_error_panic_hook"]
 
 # Protocols
 ironrdp = { workspace = true, features = [
+    "connector",
+    "session",
     "input",
     "graphics",
     "dvc",
diff --git a/crates/ironrdp/Cargo.toml b/crates/ironrdp/Cargo.toml
index ef9a46bd..d86c69ab 100644
--- a/crates/ironrdp/Cargo.toml
+++ b/crates/ironrdp/Cargo.toml
@@ -16,7 +16,7 @@ doctest = false
 test = false
 
 [features]
-default = ["core", "pdu", "connector", "session"]
+default = ["core", "pdu"]
 core = ["dep:ironrdp-core"]
 pdu = ["dep:ironrdp-pdu"]
 cliprdr = ["dep:ironrdp-cliprdr"]
@@ -50,9 +50,7 @@ ironrdp-displaycontrol = { workspace = true, optional = true }
 
 [dev-dependencies]
 ironrdp-blocking.workspace = true
-ironrdp-server.workspace = true
 ironrdp-cliprdr-native.workspace = true
-ironrdp-tls = { workspace = true, features = ["rustls"] }
 anyhow = "1"
 async-trait = "0.1"
 bmp = "0.5"
@@ -60,7 +58,6 @@ pico-args = "0.5"
 x509-cert = { version = "0.2", default-features = false, features = ["std"] }
 tracing.workspace = true
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-tokio = { version = "1.40", features = ["full"] }
 tokio-rustls = "0.26"
 rand = "0.8"
 
@@ -71,11 +68,12 @@ all-features = true
 [[example]]
 name = "screenshot"
 doc-scrape-examples = true
+required-features = ["session"]
 
 [[example]]
 name = "server"
 doc-scrape-examples = true
-required-features = ["cliprdr", "rdpsnd"]
+required-features = ["cliprdr", "rdpsnd", "server"]
 
 [lints]
 workspace = true
diff --git a/crates/ironrdp/examples/server.rs b/crates/ironrdp/examples/server.rs
index 96fea5ee..8a4ab9f9 100644
--- a/crates/ironrdp/examples/server.rs
+++ b/crates/ironrdp/examples/server.rs
@@ -16,15 +16,15 @@ use ironrdp::cliprdr::backend::{CliprdrBackend, CliprdrBackendFactory};
 use ironrdp::connector::DesktopSize;
 use ironrdp::rdpsnd::pdu::ClientAudioFormatPdu;
 use ironrdp::rdpsnd::server::{RdpsndServerHandler, RdpsndServerMessage};
-use ironrdp_cliprdr_native::StubCliprdrBackend;
-use ironrdp_server::{
+use ironrdp::server::{
+    tokio::time::{self, sleep, Duration},
+    tokio::{self, sync::mpsc::UnboundedSender},
     BitmapUpdate, CliprdrServerFactory, Credentials, DisplayUpdate, KeyboardEvent, MouseEvent, PixelFormat, PixelOrder,
     RdpServer, RdpServerDisplay, RdpServerDisplayUpdates, RdpServerInputHandler, ServerEvent, ServerEventSender,
     SoundServerFactory, TlsIdentityCtx,
 };
+use ironrdp_cliprdr_native::StubCliprdrBackend;
 use rand::prelude::*;
-use tokio::sync::mpsc::UnboundedSender;
-use tokio::time::{self, sleep, Duration};
 
 const HELP: &str = "\
 USAGE: