diff --git a/iceoryx2-ffi/ffi/src/api/waitset.rs b/iceoryx2-ffi/ffi/src/api/waitset.rs
index 64494a506..044558773 100644
--- a/iceoryx2-ffi/ffi/src/api/waitset.rs
+++ b/iceoryx2-ffi/ffi/src/api/waitset.rs
@@ -22,10 +22,10 @@ use crate::{
 
 use super::{iox2_signal_handling_mode_e, AssertNonNullHandle, HandleToType, IntoCInt};
 use iceoryx2::{
-    port::waitset::{
+    service::{ipc, local},
+    waitset::{
         WaitSet, WaitSetAttachmentError, WaitSetCreateError, WaitSetRunError, WaitSetRunResult,
     },
-    service::{ipc, local},
 };
 use iceoryx2_bb_derive_macros::StringLiteral;
 use iceoryx2_bb_elementary::static_assert::*;
diff --git a/iceoryx2-ffi/ffi/src/api/waitset_guard.rs b/iceoryx2-ffi/ffi/src/api/waitset_guard.rs
index 3b0d308f3..1279a2a0f 100644
--- a/iceoryx2-ffi/ffi/src/api/waitset_guard.rs
+++ b/iceoryx2-ffi/ffi/src/api/waitset_guard.rs
@@ -15,8 +15,8 @@
 use std::mem::ManuallyDrop;
 
 use crate::iox2_service_type_e;
-use iceoryx2::port::waitset::WaitSetGuard;
 use iceoryx2::service::{ipc, local};
+use iceoryx2::waitset::WaitSetGuard;
 use iceoryx2_bb_elementary::static_assert::*;
 use iceoryx2_ffi_macros::iceoryx2_ffi;
 
diff --git a/iceoryx2/src/lib.rs b/iceoryx2/src/lib.rs
index f0394987c..165e6b552 100644
--- a/iceoryx2/src/lib.rs
+++ b/iceoryx2/src/lib.rs
@@ -317,3 +317,7 @@ pub mod prelude;
 
 #[doc(hidden)]
 pub mod testing;
+
+/// Event handling mechanism to wait on multiple [`Listener`](crate::port::listener::Listener)s
+/// in one call, realizing the reactor pattern. (Event multiplexer)
+pub mod waitset;
diff --git a/iceoryx2/src/port/mod.rs b/iceoryx2/src/port/mod.rs
index 07482e2ee..fdbc572bf 100644
--- a/iceoryx2/src/port/mod.rs
+++ b/iceoryx2/src/port/mod.rs
@@ -31,9 +31,6 @@ pub mod subscriber;
 /// Interface to perform cyclic updates to the ports. Required to deliver history to new
 /// participants or to perform other management tasks.
 pub mod update_connections;
-/// Event handling mechanism to wait on multiple [`Listener`](crate::port::listener::Listener)s
-/// in one call, realizing the reactor pattern. (Event multiplexer)
-pub mod waitset;
 
 use crate::port::port_identifiers::*;
 use crate::service;
diff --git a/iceoryx2/src/prelude.rs b/iceoryx2/src/prelude.rs
index c515bcb84..77848bdd0 100644
--- a/iceoryx2/src/prelude.rs
+++ b/iceoryx2/src/prelude.rs
@@ -13,7 +13,6 @@
 pub use crate::config::Config;
 pub use crate::node::{node_name::NodeName, Node, NodeBuilder, NodeState};
 pub use crate::port::event_id::EventId;
-pub use crate::port::waitset::{WaitSet, WaitSetAttachmentId, WaitSetBuilder, WaitSetGuard};
 pub use crate::service::messaging_pattern::MessagingPattern;
 pub use crate::service::{
     attribute::AttributeSet, attribute::AttributeSpecifier, attribute::AttributeVerifier, ipc,
@@ -21,6 +20,7 @@ pub use crate::service::{
     service_name::ServiceName, Service, ServiceDetails,
 };
 pub use crate::signal_handling_mode::SignalHandlingMode;
+pub use crate::waitset::{WaitSet, WaitSetAttachmentId, WaitSetBuilder, WaitSetGuard};
 pub use iceoryx2_bb_derive_macros::PlacementDefault;
 pub use iceoryx2_bb_elementary::alignment::Alignment;
 pub use iceoryx2_bb_elementary::placement_default::PlacementDefault;
diff --git a/iceoryx2/src/port/waitset.rs b/iceoryx2/src/waitset.rs
similarity index 100%
rename from iceoryx2/src/port/waitset.rs
rename to iceoryx2/src/waitset.rs
diff --git a/iceoryx2/tests/waitset_tests.rs b/iceoryx2/tests/waitset_tests.rs
index 5d29a3693..7018dcc6a 100644
--- a/iceoryx2/tests/waitset_tests.rs
+++ b/iceoryx2/tests/waitset_tests.rs
@@ -16,9 +16,9 @@ mod waitset {
 
     use iceoryx2::port::listener::Listener;
     use iceoryx2::port::notifier::Notifier;
-    use iceoryx2::port::waitset::{WaitSetAttachmentError, WaitSetRunError};
     use iceoryx2::prelude::{WaitSetBuilder, *};
     use iceoryx2::testing::*;
+    use iceoryx2::waitset::{WaitSetAttachmentError, WaitSetRunError};
     use iceoryx2_bb_posix::config::test_directory;
     use iceoryx2_bb_posix::directory::Directory;
     use iceoryx2_bb_posix::file::Permission;