diff --git a/src/main/java/com/hivemq/mqtt/client2/internal/handler/auth/MqttReAuthCompletable.java b/src/main/java/com/hivemq/mqtt/client2/internal/handler/auth/MqttReAuthCompletable.java
index a7a3ec47f..a3438615e 100644
--- a/src/main/java/com/hivemq/mqtt/client2/internal/handler/auth/MqttReAuthCompletable.java
+++ b/src/main/java/com/hivemq/mqtt/client2/internal/handler/auth/MqttReAuthCompletable.java
@@ -19,7 +19,7 @@
 import com.hivemq.mqtt.client2.internal.MqttClientConfig;
 import com.hivemq.mqtt.client2.internal.MqttClientConnectionConfig;
 import com.hivemq.mqtt.client2.internal.exceptions.MqttClientStateExceptions;
-import com.hivemq.mqtt.client2.rx.internal.CompletableFlow;
+import com.hivemq.mqtt.client2.internal.rx.CompletableFlow;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;
 import io.reactivex.rxjava3.core.Completable;
diff --git a/src/main/java/com/hivemq/mqtt/client2/internal/handler/auth/MqttReAuthHandler.java b/src/main/java/com/hivemq/mqtt/client2/internal/handler/auth/MqttReAuthHandler.java
index db9f9258e..d3253cf16 100644
--- a/src/main/java/com/hivemq/mqtt/client2/internal/handler/auth/MqttReAuthHandler.java
+++ b/src/main/java/com/hivemq/mqtt/client2/internal/handler/auth/MqttReAuthHandler.java
@@ -23,6 +23,7 @@
 import com.hivemq.mqtt.client2.internal.message.auth.MqttAuth;
 import com.hivemq.mqtt.client2.internal.message.auth.MqttAuthBuilder;
 import com.hivemq.mqtt.client2.internal.message.disconnect.MqttDisconnect;
+import com.hivemq.mqtt.client2.internal.rx.CompletableFlow;
 import com.hivemq.mqtt.client2.mqtt5.Mqtt5ClientConfig;
 import com.hivemq.mqtt.client2.mqtt5.auth.Mqtt5EnhancedAuthMechanism;
 import com.hivemq.mqtt.client2.mqtt5.exceptions.Mqtt5AuthException;
@@ -30,7 +31,6 @@
 import com.hivemq.mqtt.client2.mqtt5.message.auth.Mqtt5AuthBuilder;
 import com.hivemq.mqtt.client2.mqtt5.message.disconnect.Mqtt5Disconnect;
 import com.hivemq.mqtt.client2.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode;
-import com.hivemq.mqtt.client2.rx.internal.CompletableFlow;
 import io.netty.channel.ChannelHandlerContext;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/com/hivemq/mqtt/client2/internal/handler/disconnect/MqttDisconnectCompletable.java b/src/main/java/com/hivemq/mqtt/client2/internal/handler/disconnect/MqttDisconnectCompletable.java
index baf622667..7b7065364 100644
--- a/src/main/java/com/hivemq/mqtt/client2/internal/handler/disconnect/MqttDisconnectCompletable.java
+++ b/src/main/java/com/hivemq/mqtt/client2/internal/handler/disconnect/MqttDisconnectCompletable.java
@@ -20,7 +20,7 @@
 import com.hivemq.mqtt.client2.internal.MqttClientConnectionConfig;
 import com.hivemq.mqtt.client2.internal.exceptions.MqttClientStateExceptions;
 import com.hivemq.mqtt.client2.internal.message.disconnect.MqttDisconnect;
-import com.hivemq.mqtt.client2.rx.internal.CompletableFlow;
+import com.hivemq.mqtt.client2.internal.rx.CompletableFlow;
 import io.netty.channel.Channel;
 import io.reactivex.rxjava3.core.Completable;
 import io.reactivex.rxjava3.core.CompletableObserver;
diff --git a/src/main/java/com/hivemq/mqtt/client2/internal/handler/disconnect/MqttDisconnectEvent.java b/src/main/java/com/hivemq/mqtt/client2/internal/handler/disconnect/MqttDisconnectEvent.java
index 94594e672..60bb6e436 100644
--- a/src/main/java/com/hivemq/mqtt/client2/internal/handler/disconnect/MqttDisconnectEvent.java
+++ b/src/main/java/com/hivemq/mqtt/client2/internal/handler/disconnect/MqttDisconnectEvent.java
@@ -17,10 +17,10 @@
 package com.hivemq.mqtt.client2.internal.handler.disconnect;
 
 import com.hivemq.mqtt.client2.internal.message.disconnect.MqttDisconnect;
+import com.hivemq.mqtt.client2.internal.rx.CompletableFlow;
 import com.hivemq.mqtt.client2.lifecycle.MqttDisconnectSource;
 import com.hivemq.mqtt.client2.mqtt5.exceptions.Mqtt5DisconnectException;
 import com.hivemq.mqtt.client2.mqtt5.message.disconnect.Mqtt5Disconnect;
-import com.hivemq.mqtt.client2.rx.internal.CompletableFlow;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/com/hivemq/mqtt/client2/internal/handler/disconnect/MqttDisconnectHandler.java b/src/main/java/com/hivemq/mqtt/client2/internal/handler/disconnect/MqttDisconnectHandler.java
index c40a4f0bd..f2399f8af 100644
--- a/src/main/java/com/hivemq/mqtt/client2/internal/handler/disconnect/MqttDisconnectHandler.java
+++ b/src/main/java/com/hivemq/mqtt/client2/internal/handler/disconnect/MqttDisconnectHandler.java
@@ -32,12 +32,12 @@
 import com.hivemq.mqtt.client2.internal.message.connect.MqttConnect;
 import com.hivemq.mqtt.client2.internal.message.connect.MqttConnectRestrictions;
 import com.hivemq.mqtt.client2.internal.message.disconnect.MqttDisconnect;
+import com.hivemq.mqtt.client2.internal.rx.CompletableFlow;
 import com.hivemq.mqtt.client2.lifecycle.MqttDisconnectSource;
 import com.hivemq.mqtt.client2.mqtt5.auth.Mqtt5EnhancedAuthMechanism;
 import com.hivemq.mqtt.client2.mqtt5.exceptions.Mqtt5ConnAckException;
 import com.hivemq.mqtt.client2.mqtt5.exceptions.Mqtt5DisconnectException;
 import com.hivemq.mqtt.client2.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode;
-import com.hivemq.mqtt.client2.rx.internal.CompletableFlow;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.EventLoop;
diff --git a/src/main/java/com/hivemq/mqtt/client2/rx/internal/CompletableFlow.java b/src/main/java/com/hivemq/mqtt/client2/internal/rx/CompletableFlow.java
similarity index 96%
rename from src/main/java/com/hivemq/mqtt/client2/rx/internal/CompletableFlow.java
rename to src/main/java/com/hivemq/mqtt/client2/internal/rx/CompletableFlow.java
index f981d0cbc..d70b36321 100644
--- a/src/main/java/com/hivemq/mqtt/client2/rx/internal/CompletableFlow.java
+++ b/src/main/java/com/hivemq/mqtt/client2/internal/rx/CompletableFlow.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.rx.internal;
+package com.hivemq.mqtt.client2.internal.rx;
 
 import io.reactivex.rxjava3.core.CompletableObserver;
 import io.reactivex.rxjava3.disposables.Disposable;