diff --git a/implementation/revapi.json b/implementation/revapi.json
index 5f0b5f1ee..4e3bf76ef 100644
--- a/implementation/revapi.json
+++ b/implementation/revapi.json
@@ -9,8 +9,8 @@
     "filter" : {
       "packages" : {
         "regex" : true,
-        "include" : [ "io\\.smallrye\\.mutiny\\..*", "io\\.smallrye\\.mutiny\\.*" ],
-        "exclude" : [ "io\\.smallrye\\.mutiny\\.operators\\.*", "io\\.smallrye\\.mutiny\\.operators\\..*" ]
+        "include" : [ "io\\.smallrye\\.mutiny(\\..+)?" ],
+        "exclude" : [ "io\\.smallrye\\.mutiny\\.operators(\\..+)?" ]
       }
     }
   }
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/MultiBroadcast.java b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiBroadcast.java
index a2663852e..e08c6bfb8 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/MultiBroadcast.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiBroadcast.java
@@ -7,7 +7,7 @@
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.MultiBroadcaster;
+import io.smallrye.mutiny.operators.multi.MultiBroadcaster;
 
 /**
  * Makes the upstream {@link Multi} be able to broadcast its events ({@code items}, {@code failure}, and
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/MultiIfEmpty.java b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiIfEmpty.java
index b5fa11955..9f5906d13 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/MultiIfEmpty.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiIfEmpty.java
@@ -14,7 +14,7 @@
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.MultiSwitchOnEmpty;
+import io.smallrye.mutiny.operators.multi.MultiSwitchOnEmpty;
 import io.smallrye.mutiny.subscription.MultiEmitter;
 
 public class MultiIfEmpty<T> {
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombination.java b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombination.java
index b20505c4a..c4428116b 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombination.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombination.java
@@ -7,7 +7,6 @@
 import org.reactivestreams.Publisher;
 
 import io.smallrye.mutiny.Multi;
-import io.smallrye.mutiny.operators.*;
 
 public class MultiItemCombination {
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine2.java b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine2.java
similarity index 98%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine2.java
rename to implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine2.java
index 580772c0b..f354f1718 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine2.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine2.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.groups;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 import static io.smallrye.mutiny.helpers.ParameterValidation.size;
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine3.java b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine3.java
similarity index 98%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine3.java
rename to implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine3.java
index c3e7bcd19..24cecff51 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine3.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine3.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.groups;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 import static io.smallrye.mutiny.helpers.ParameterValidation.size;
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine4.java b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine4.java
similarity index 98%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine4.java
rename to implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine4.java
index 49eb0ea3a..8de70cf66 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine4.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine4.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.groups;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 import static io.smallrye.mutiny.helpers.ParameterValidation.size;
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine5.java b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine5.java
similarity index 98%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine5.java
rename to implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine5.java
index 4f93353cf..6f8222dbe 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine5.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine5.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.groups;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 import static io.smallrye.mutiny.helpers.ParameterValidation.size;
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine6.java b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine6.java
similarity index 98%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine6.java
rename to implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine6.java
index 9199de006..b235373b6 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine6.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine6.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.groups;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 import static io.smallrye.mutiny.helpers.ParameterValidation.size;
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine7.java b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine7.java
similarity index 98%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine7.java
rename to implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine7.java
index 3bdb3b292..5b2152831 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine7.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine7.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.groups;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 import static io.smallrye.mutiny.helpers.ParameterValidation.size;
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine8.java b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine8.java
similarity index 98%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine8.java
rename to implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine8.java
index b9c5d4fc8..cda53f32d 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine8.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine8.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.groups;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 import static io.smallrye.mutiny.helpers.ParameterValidation.size;
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine9.java b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine9.java
similarity index 98%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine9.java
rename to implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine9.java
index fa9081a18..26fab385b 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombine9.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombine9.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.groups;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 import static io.smallrye.mutiny.helpers.ParameterValidation.size;
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombineIterable.java b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombineIterable.java
similarity index 98%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombineIterable.java
rename to implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombineIterable.java
index d52a13303..59b942437 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiItemCombineIterable.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiItemCombineIterable.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.groups;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/MultiMerge.java b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiMerge.java
index 338b5438d..55fa2467f 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/MultiMerge.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiMerge.java
@@ -8,7 +8,7 @@
 
 import io.smallrye.mutiny.CompositeException;
 import io.smallrye.mutiny.Multi;
-import io.smallrye.mutiny.operators.MultiCombine;
+import io.smallrye.mutiny.operators.multi.MultiCombine;
 
 /**
  * Creates new {@link Multi} by merging several {@link Multi} or {@link Publisher}.
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/MultiOnCompletion.java b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiOnCompletion.java
index 09d1e0654..d2de264ef 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/MultiOnCompletion.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiOnCompletion.java
@@ -13,9 +13,9 @@
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.MultiSwitchOnCompletion;
 import io.smallrye.mutiny.operators.multi.MultiOnCompletionCall;
 import io.smallrye.mutiny.operators.multi.MultiOnCompletionInvoke;
+import io.smallrye.mutiny.operators.multi.MultiSwitchOnCompletion;
 import io.smallrye.mutiny.subscription.MultiEmitter;
 
 public class MultiOnCompletion<T> {
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/MultiOnFailure.java b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiOnFailure.java
index fb7273bdf..cc961257e 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/MultiOnFailure.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/MultiOnFailure.java
@@ -12,9 +12,9 @@
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.MultiFlatMapOnFailure;
-import io.smallrye.mutiny.operators.MultiOnFailureTransform;
+import io.smallrye.mutiny.operators.multi.MultiFlatMapOnFailure;
 import io.smallrye.mutiny.operators.multi.MultiOnFailureInvoke;
+import io.smallrye.mutiny.operators.multi.MultiOnFailureTransform;
 import io.smallrye.mutiny.subscription.Cancellable;
 
 /**
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroupIterable.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroupIterable.java
index c75c99720..d8bb15f98 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroupIterable.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroupIterable.java
@@ -9,7 +9,7 @@
 
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniAndCombination;
+import io.smallrye.mutiny.operators.uni.UniAndCombination;
 
 public class UniAndGroupIterable<T1> {
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniAny.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniAny.java
index 35c14f7c1..51bc9a4e3 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/UniAny.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/UniAny.java
@@ -8,7 +8,7 @@
 
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniOrCombination;
+import io.smallrye.mutiny.operators.uni.UniOrCombination;
 
 public class UniAny {
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniAwait.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniAwait.java
index 1e8ef4b1d..7971f29e7 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/UniAwait.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/UniAwait.java
@@ -7,7 +7,7 @@
 
 import io.smallrye.mutiny.TimeoutException;
 import io.smallrye.mutiny.Uni;
-import io.smallrye.mutiny.operators.UniBlockingAwait;
+import io.smallrye.mutiny.operators.uni.UniBlockingAwait;
 
 /**
  * Waits and returns the item emitted by the {@link Uni}. If the {@link Uni} receives a failure, the failure is thrown.
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniAwaitOptional.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniAwaitOptional.java
index a6a76681b..68bebf783 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/UniAwaitOptional.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/UniAwaitOptional.java
@@ -7,7 +7,7 @@
 
 import io.smallrye.mutiny.TimeoutException;
 import io.smallrye.mutiny.Uni;
-import io.smallrye.mutiny.operators.UniBlockingAwait;
+import io.smallrye.mutiny.operators.uni.UniBlockingAwait;
 
 /**
  * Likes {@link UniAwait} but wrapping the item event into an {@link Optional}. This optional is empty if the
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniCreate.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniCreate.java
index 8bccdb51f..98dc93c65 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/UniCreate.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/UniCreate.java
@@ -17,7 +17,7 @@
 import io.smallrye.mutiny.converters.UniConverter;
 import io.smallrye.mutiny.helpers.ParameterValidation;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.*;
+import io.smallrye.mutiny.operators.uni.UniNever;
 import io.smallrye.mutiny.operators.uni.builders.*;
 import io.smallrye.mutiny.subscription.UniEmitter;
 import io.smallrye.mutiny.subscription.UniSubscriber;
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniMemoize.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniMemoize.java
index 7b5621372..eeee30e78 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/UniMemoize.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/UniMemoize.java
@@ -10,7 +10,7 @@
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
 import io.smallrye.mutiny.operators.AbstractUni;
-import io.smallrye.mutiny.operators.UniMemoizeOp;
+import io.smallrye.mutiny.operators.uni.UniMemoizeOp;
 
 @Experimental("Memoization is an experimental feature at this stage")
 public class UniMemoize<T> {
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnCancel.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnCancel.java
index b2b62dab8..5ff0b0eb5 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnCancel.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnCancel.java
@@ -7,8 +7,8 @@
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.helpers.ParameterValidation;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniOnCancellation;
-import io.smallrye.mutiny.operators.UniOnCancellationCall;
+import io.smallrye.mutiny.operators.uni.UniOnCancellation;
+import io.smallrye.mutiny.operators.uni.UniOnCancellationCall;
 
 public class UniOnCancel<T> {
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnFailure.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnFailure.java
index 2cb05f6db..15de8ad5c 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnFailure.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnFailure.java
@@ -11,9 +11,9 @@
 import io.smallrye.mutiny.CompositeException;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniOnFailureFlatMap;
-import io.smallrye.mutiny.operators.UniOnFailureTransform;
-import io.smallrye.mutiny.operators.UniOnItemConsume;
+import io.smallrye.mutiny.operators.uni.UniOnFailureFlatMap;
+import io.smallrye.mutiny.operators.uni.UniOnFailureTransform;
+import io.smallrye.mutiny.operators.uni.UniOnItemConsume;
 
 /**
  * Configures the failure handler.
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnItem.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnItem.java
index 0343806ba..16ee9cbb4 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnItem.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnItem.java
@@ -14,10 +14,10 @@
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniOnItemConsume;
-import io.smallrye.mutiny.operators.UniOnItemTransform;
-import io.smallrye.mutiny.operators.UniOnItemTransformToMulti;
-import io.smallrye.mutiny.operators.UniOnItemTransformToUni;
+import io.smallrye.mutiny.operators.uni.UniOnItemConsume;
+import io.smallrye.mutiny.operators.uni.UniOnItemTransform;
+import io.smallrye.mutiny.operators.uni.UniOnItemTransformToMulti;
+import io.smallrye.mutiny.operators.uni.UniOnItemTransformToUni;
 import io.smallrye.mutiny.subscription.UniEmitter;
 
 public class UniOnItem<T> {
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnItemDelay.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnItemDelay.java
index e509db4d0..78877eb93 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnItemDelay.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnItemDelay.java
@@ -8,8 +8,8 @@
 
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniDelayOnItem;
-import io.smallrye.mutiny.operators.UniDelayUntil;
+import io.smallrye.mutiny.operators.uni.UniDelayOnItem;
+import io.smallrye.mutiny.operators.uni.UniDelayUntil;
 
 /**
  * Configures the delay applied to the item emission.
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnItemOrFailure.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnItemOrFailure.java
index 6078a4446..9ff16929f 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnItemOrFailure.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnItemOrFailure.java
@@ -9,9 +9,9 @@
 import io.smallrye.mutiny.CompositeException;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniOnItemOrFailureConsume;
-import io.smallrye.mutiny.operators.UniOnItemOrFailureFlatMap;
-import io.smallrye.mutiny.operators.UniOnItemOrFailureMap;
+import io.smallrye.mutiny.operators.uni.UniOnItemOrFailureConsume;
+import io.smallrye.mutiny.operators.uni.UniOnItemOrFailureFlatMap;
+import io.smallrye.mutiny.operators.uni.UniOnItemOrFailureMap;
 import io.smallrye.mutiny.subscription.UniEmitter;
 import io.smallrye.mutiny.tuples.Functions;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnSubscribe.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnSubscribe.java
index 01c37c4c6..7815628c6 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnSubscribe.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnSubscribe.java
@@ -8,8 +8,8 @@
 
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniOnSubscribeCall;
-import io.smallrye.mutiny.operators.UniOnSubscribeInvoke;
+import io.smallrye.mutiny.operators.uni.UniOnSubscribeCall;
+import io.smallrye.mutiny.operators.uni.UniOnSubscribeInvoke;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
 /**
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnTerminate.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnTerminate.java
index 8fc697dc4..eda2e0a33 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnTerminate.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnTerminate.java
@@ -6,8 +6,8 @@
 
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniOnTermination;
-import io.smallrye.mutiny.operators.UniOnTerminationCall;
+import io.smallrye.mutiny.operators.uni.UniOnTermination;
+import io.smallrye.mutiny.operators.uni.UniOnTerminationCall;
 import io.smallrye.mutiny.tuples.Functions;
 
 public class UniOnTerminate<T> {
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnTimeout.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnTimeout.java
index 9fd8e520d..96f2b0b7d 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnTimeout.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/UniOnTimeout.java
@@ -10,7 +10,7 @@
 import io.smallrye.mutiny.TimeoutException;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniFailOnTimeout;
+import io.smallrye.mutiny.operators.uni.UniFailOnTimeout;
 
 public class UniOnTimeout<T> {
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniOr.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniOr.java
index 50bea2acf..f87e6d9c5 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/UniOr.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/UniOr.java
@@ -8,7 +8,7 @@
 
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniOrCombination;
+import io.smallrye.mutiny.operators.uni.UniOrCombination;
 
 public class UniOr<T> {
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniRetry.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniRetry.java
index 16c5288b9..d56606068 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/UniRetry.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/UniRetry.java
@@ -14,7 +14,7 @@
 import io.smallrye.mutiny.helpers.ExponentialBackoff;
 import io.smallrye.mutiny.helpers.ParameterValidation;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.UniRetryAtMost;
+import io.smallrye.mutiny.operators.uni.UniRetryAtMost;
 
 // TODO This method should be renamed to UniOnFailureRetry, however it's a breaking change.
 public class UniRetry<T> {
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniSubscribe.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniSubscribe.java
index 88d70b008..de92c219f 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/groups/UniSubscribe.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/groups/UniSubscribe.java
@@ -9,7 +9,7 @@
 import io.smallrye.mutiny.infrastructure.Infrastructure;
 import io.smallrye.mutiny.operators.AbstractUni;
 import io.smallrye.mutiny.operators.UniSerializedSubscriber;
-import io.smallrye.mutiny.operators.UniSubscribeToCompletionStage;
+import io.smallrye.mutiny.operators.uni.UniSubscribeToCompletionStage;
 import io.smallrye.mutiny.subscription.Cancellable;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/AbstractUni.java b/implementation/src/main/java/io/smallrye/mutiny/operators/AbstractUni.java
index e3b6cc8eb..352720870 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/AbstractUni.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/AbstractUni.java
@@ -9,6 +9,9 @@
 import io.smallrye.mutiny.groups.*;
 import io.smallrye.mutiny.helpers.ParameterValidation;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
+import io.smallrye.mutiny.operators.uni.UniEmitOn;
+import io.smallrye.mutiny.operators.uni.UniMemoizeOp;
+import io.smallrye.mutiny.operators.uni.UniRunSubscribeOn;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.tuples.Tuple2;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiBroadcaster.java b/implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiBroadcaster.java
similarity index 98%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/MultiBroadcaster.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiBroadcaster.java
index 5c8cba15a..f47be90c9 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiBroadcaster.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiBroadcaster.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.multi;
 
 import java.time.Duration;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiCombine.java b/implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiCombine.java
similarity index 96%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/MultiCombine.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiCombine.java
index d4887068e..ba540198c 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiCombine.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiCombine.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.multi;
 
 import java.util.List;
 import java.util.function.Function;
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiFlatMapOnFailure.java b/implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiFlatMapOnFailure.java
similarity index 94%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/MultiFlatMapOnFailure.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiFlatMapOnFailure.java
index 9fb18da31..151e6a9d8 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiFlatMapOnFailure.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiFlatMapOnFailure.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.multi;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.MAPPER_RETURNED_NULL;
 
@@ -11,7 +11,7 @@
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.multi.MultiOnFailureResumeOp;
+import io.smallrye.mutiny.operators.MultiOperator;
 
 public class MultiFlatMapOnFailure<T> extends MultiOperator<T, T> {
     private final Predicate<? super Throwable> predicate;
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiGroupByOp.java b/implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiGroupByOp.java
index b63bd988f..048549b7c 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiGroupByOp.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiGroupByOp.java
@@ -261,7 +261,7 @@ boolean isDoneOrCancelled(boolean d, boolean empty, Queue<?> q) {
         }
     }
 
-    static final class GroupedUnicast<K, T> extends AbstractMulti<T> implements GroupedMulti<K, T> {
+    public static final class GroupedUnicast<K, T> extends AbstractMulti<T> implements GroupedMulti<K, T> {
 
         private final State<T, K> downstream;
         private final K key;
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiOnFailureTransform.java b/implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiOnFailureTransform.java
similarity index 94%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/MultiOnFailureTransform.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiOnFailureTransform.java
index 02c5be919..0fe2409b2 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiOnFailureTransform.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiOnFailureTransform.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.multi;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.MAPPER_RETURNED_NULL;
 
@@ -11,7 +11,7 @@
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.multi.MultiOnFailureResumeOp;
+import io.smallrye.mutiny.operators.MultiOperator;
 
 public class MultiOnFailureTransform<T> extends MultiOperator<T, T> {
     private final Predicate<? super Throwable> predicate;
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiSwitchOnCompletion.java b/implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiSwitchOnCompletion.java
similarity index 94%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/MultiSwitchOnCompletion.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiSwitchOnCompletion.java
index 6c6dd6e64..6fb098f6f 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiSwitchOnCompletion.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiSwitchOnCompletion.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.multi;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.SUPPLIER_PRODUCED_NULL;
 
@@ -9,7 +9,7 @@
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.multi.MultiConcatOp;
+import io.smallrye.mutiny.operators.MultiOperator;
 
 public class MultiSwitchOnCompletion<T> extends MultiOperator<T, T> {
     private final Supplier<Publisher<? extends T>> supplier;
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiSwitchOnEmpty.java b/implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiSwitchOnEmpty.java
similarity index 94%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/MultiSwitchOnEmpty.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiSwitchOnEmpty.java
index 07161a16d..0e661c043 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/MultiSwitchOnEmpty.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/multi/MultiSwitchOnEmpty.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.multi;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.SUPPLIER_PRODUCED_NULL;
 
@@ -9,7 +9,7 @@
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import io.smallrye.mutiny.operators.multi.MultiSwitchOnEmptyOp;
+import io.smallrye.mutiny.operators.MultiOperator;
 import io.smallrye.mutiny.operators.multi.builders.FailedMulti;
 
 public class MultiSwitchOnEmpty<T> extends MultiOperator<T, T> {
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniAndCombination.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniAndCombination.java
similarity index 98%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniAndCombination.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniAndCombination.java
index b561f764e..44011b913 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniAndCombination.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniAndCombination.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,6 +13,8 @@
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.helpers.EmptyUniSubscription;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
+import io.smallrye.mutiny.operators.AbstractUni;
+import io.smallrye.mutiny.operators.UniOperator;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniBlockingAwait.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniBlockingAwait.java
similarity index 96%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniBlockingAwait.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniBlockingAwait.java
index 42cc4b735..09bae33d4 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniBlockingAwait.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniBlockingAwait.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 import static io.smallrye.mutiny.helpers.ParameterValidation.validate;
@@ -12,6 +12,7 @@
 import io.smallrye.mutiny.TimeoutException;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
+import io.smallrye.mutiny.operators.AbstractUni;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniDelayOnItem.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniDelayOnItem.java
similarity index 92%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniDelayOnItem.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniDelayOnItem.java
index 8fcac80b0..81e349b6f 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniDelayOnItem.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniDelayOnItem.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import static io.smallrye.mutiny.helpers.EmptyUniSubscription.CANCELLED;
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
@@ -11,6 +11,9 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.operators.AbstractUni;
+import io.smallrye.mutiny.operators.UniOperator;
+import io.smallrye.mutiny.subscription.UniDelegatingSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniDelayUntil.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniDelayUntil.java
similarity index 92%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniDelayUntil.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniDelayUntil.java
index a14e57073..483b0cf4a 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniDelayUntil.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniDelayUntil.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import static io.smallrye.mutiny.helpers.EmptyUniSubscription.CANCELLED;
 
@@ -7,6 +7,9 @@
 import java.util.function.Function;
 
 import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.operators.AbstractUni;
+import io.smallrye.mutiny.operators.UniOperator;
+import io.smallrye.mutiny.subscription.UniDelegatingSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniEmitOn.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniEmitOn.java
similarity index 76%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniEmitOn.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniEmitOn.java
index 362e1f878..48e90b871 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniEmitOn.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniEmitOn.java
@@ -1,16 +1,19 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 
 import java.util.concurrent.Executor;
 
 import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.operators.AbstractUni;
+import io.smallrye.mutiny.operators.UniOperator;
+import io.smallrye.mutiny.subscription.UniDelegatingSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 
 public class UniEmitOn<I> extends UniOperator<I, I> {
     private final Executor executor;
 
-    UniEmitOn(Uni<I> upstream, Executor executor) {
+    public UniEmitOn(Uni<I> upstream, Executor executor) {
         super(upstream);
         this.executor = nonNull(executor, "executor");
     }
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniFailOnTimeout.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniFailOnTimeout.java
similarity index 96%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniFailOnTimeout.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniFailOnTimeout.java
index 4243ffeea..83f6c56ee 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniFailOnTimeout.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniFailOnTimeout.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import java.time.Duration;
 import java.util.concurrent.RejectedExecutionException;
@@ -13,6 +13,8 @@
 import io.smallrye.mutiny.helpers.ParameterValidation;
 import io.smallrye.mutiny.helpers.Subscriptions;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
+import io.smallrye.mutiny.operators.AbstractUni;
+import io.smallrye.mutiny.operators.UniOperator;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniMemoizeOp.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniMemoizeOp.java
similarity index 97%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniMemoizeOp.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniMemoizeOp.java
index 780ee8ba8..8b6ab42b4 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniMemoizeOp.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniMemoizeOp.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 import static java.util.Collections.synchronizedList;
@@ -11,6 +11,8 @@
 
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.helpers.EmptyUniSubscription;
+import io.smallrye.mutiny.operators.AbstractUni;
+import io.smallrye.mutiny.operators.UniOperator;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniNever.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniNever.java
similarity index 83%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniNever.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniNever.java
index 1ce316eae..779325c60 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniNever.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniNever.java
@@ -1,7 +1,8 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import static io.smallrye.mutiny.helpers.EmptyUniSubscription.CANCELLED;
 
+import io.smallrye.mutiny.operators.AbstractUni;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 
 public class UniNever<T> extends AbstractUni<T> {
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnCancellation.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnCancellation.java
similarity index 79%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniOnCancellation.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnCancellation.java
index c63c98ac3..412f5c7ae 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnCancellation.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnCancellation.java
@@ -1,6 +1,9 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.operators.AbstractUni;
+import io.smallrye.mutiny.operators.UniOperator;
+import io.smallrye.mutiny.subscription.UniDelegatingSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnCancellationCall.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnCancellationCall.java
similarity index 91%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniOnCancellationCall.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnCancellationCall.java
index cb67824dc..8ed529a6a 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnCancellationCall.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnCancellationCall.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 
@@ -6,6 +6,8 @@
 
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
+import io.smallrye.mutiny.operators.UniOperator;
+import io.smallrye.mutiny.subscription.UniDelegatingSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnFailureFlatMap.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnFailureFlatMap.java
similarity index 90%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniOnFailureFlatMap.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnFailureFlatMap.java
index 4c6528f78..4662342a4 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnFailureFlatMap.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnFailureFlatMap.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 
@@ -7,6 +7,9 @@
 
 import io.smallrye.mutiny.CompositeException;
 import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.operators.AbstractUni;
+import io.smallrye.mutiny.operators.UniOperator;
+import io.smallrye.mutiny.subscription.UniDelegatingSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnFailureTransform.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnFailureTransform.java
similarity index 91%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniOnFailureTransform.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnFailureTransform.java
index 5a1e6abf3..aa30cf7d5 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnFailureTransform.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnFailureTransform.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.SUPPLIER_PRODUCED_NULL;
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
@@ -8,6 +8,9 @@
 
 import io.smallrye.mutiny.CompositeException;
 import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.operators.AbstractUni;
+import io.smallrye.mutiny.operators.UniOperator;
+import io.smallrye.mutiny.subscription.UniDelegatingSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 
 public class UniOnFailureTransform<I, O> extends UniOperator<I, O> {
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnItemConsume.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnItemConsume.java
similarity index 93%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniOnItemConsume.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnItemConsume.java
index 0ee4d31b2..5c7fc3ef0 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnItemConsume.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnItemConsume.java
@@ -1,10 +1,13 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 import io.smallrye.mutiny.CompositeException;
 import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.operators.AbstractUni;
+import io.smallrye.mutiny.operators.UniOperator;
+import io.smallrye.mutiny.subscription.UniDelegatingSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 
 public class UniOnItemConsume<T> extends UniOperator<T, T> {
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnItemOrFailureConsume.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnItemOrFailureConsume.java
similarity index 88%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniOnItemOrFailureConsume.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnItemOrFailureConsume.java
index 6f330eec2..512fde335 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnItemOrFailureConsume.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnItemOrFailureConsume.java
@@ -1,9 +1,12 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import java.util.function.BiConsumer;
 
 import io.smallrye.mutiny.CompositeException;
 import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.operators.AbstractUni;
+import io.smallrye.mutiny.operators.UniOperator;
+import io.smallrye.mutiny.subscription.UniDelegatingSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 
 public class UniOnItemOrFailureConsume<T> extends UniOperator<T, T> {
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnItemOrFailureFlatMap.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnItemOrFailureFlatMap.java
similarity index 88%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniOnItemOrFailureFlatMap.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnItemOrFailureFlatMap.java
index 7f0b9225b..5fc1c262b 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnItemOrFailureFlatMap.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnItemOrFailureFlatMap.java
@@ -1,11 +1,14 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
-import static io.smallrye.mutiny.operators.UniOnItemTransformToUni.handleInnerSubscription;
+import static io.smallrye.mutiny.operators.uni.UniOnItemTransformToUni.handleInnerSubscription;
 
 import java.util.function.BiFunction;
 
 import io.smallrye.mutiny.CompositeException;
 import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.operators.AbstractUni;
+import io.smallrye.mutiny.operators.UniOperator;
+import io.smallrye.mutiny.subscription.UniDelegatingSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnItemOrFailureMap.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnItemOrFailureMap.java
similarity index 92%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniOnItemOrFailureMap.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnItemOrFailureMap.java
index b01cb945a..b62deebe0 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnItemOrFailureMap.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnItemOrFailureMap.java
@@ -1,10 +1,13 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BiFunction;
 
 import io.smallrye.mutiny.CompositeException;
 import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.operators.AbstractUni;
+import io.smallrye.mutiny.operators.UniOperator;
+import io.smallrye.mutiny.subscription.UniDelegatingSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnItemTransform.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnItemTransform.java
similarity index 85%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniOnItemTransform.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnItemTransform.java
index 8fbe2b6a2..e18ce4e5a 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnItemTransform.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnItemTransform.java
@@ -1,9 +1,12 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import java.util.function.Function;
 
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.helpers.ParameterValidation;
+import io.smallrye.mutiny.operators.AbstractUni;
+import io.smallrye.mutiny.operators.UniOperator;
+import io.smallrye.mutiny.subscription.UniDelegatingSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 
 public class UniOnItemTransform<I, O> extends UniOperator<I, O> {
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnItemTransformToMulti.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnItemTransformToMulti.java
similarity index 96%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniOnItemTransformToMulti.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnItemTransformToMulti.java
index 1efcf2145..9b768079f 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnItemTransformToMulti.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnItemTransformToMulti.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.MAPPER_RETURNED_NULL;
 
@@ -13,6 +13,8 @@
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.helpers.EmptyUniSubscription;
 import io.smallrye.mutiny.helpers.Subscriptions;
+import io.smallrye.mutiny.operators.AbstractMulti;
+import io.smallrye.mutiny.operators.AbstractUni;
 import io.smallrye.mutiny.subscription.MultiSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnItemTransformToUni.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnItemTransformToUni.java
similarity index 95%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniOnItemTransformToUni.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnItemTransformToUni.java
index b3c14721d..f83f278e2 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnItemTransformToUni.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnItemTransformToUni.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.MAPPER_RETURNED_NULL;
 
@@ -10,6 +10,9 @@
 import io.smallrye.mutiny.CompositeException;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.helpers.EmptyUniSubscription;
+import io.smallrye.mutiny.operators.AbstractUni;
+import io.smallrye.mutiny.operators.UniOperator;
+import io.smallrye.mutiny.subscription.UniDelegatingSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnSubscribeCall.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnSubscribeCall.java
similarity index 94%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniOnSubscribeCall.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnSubscribeCall.java
index 5614035dd..80676213f 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnSubscribeCall.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnSubscribeCall.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -7,6 +7,9 @@
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.helpers.EmptyUniSubscription;
 import io.smallrye.mutiny.helpers.ParameterValidation;
+import io.smallrye.mutiny.operators.AbstractUni;
+import io.smallrye.mutiny.operators.UniOperator;
+import io.smallrye.mutiny.subscription.UniDelegatingSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnSubscribeInvoke.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnSubscribeInvoke.java
similarity index 86%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniOnSubscribeInvoke.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnSubscribeInvoke.java
index 6608b97c7..e93b872ec 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnSubscribeInvoke.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnSubscribeInvoke.java
@@ -1,9 +1,12 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import java.util.function.Consumer;
 
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.helpers.EmptyUniSubscription;
+import io.smallrye.mutiny.operators.AbstractUni;
+import io.smallrye.mutiny.operators.UniOperator;
+import io.smallrye.mutiny.subscription.UniDelegatingSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnTermination.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnTermination.java
similarity index 90%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniOnTermination.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnTermination.java
index 2a9a92070..fc670ffd9 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnTermination.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnTermination.java
@@ -1,7 +1,10 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import io.smallrye.mutiny.CompositeException;
 import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.operators.AbstractUni;
+import io.smallrye.mutiny.operators.UniOperator;
+import io.smallrye.mutiny.subscription.UniDelegatingSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 import io.smallrye.mutiny.tuples.Functions;
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnTerminationCall.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnTerminationCall.java
similarity index 96%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniOnTerminationCall.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnTerminationCall.java
index a87f7d9fa..7cb5fe7d9 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOnTerminationCall.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOnTerminationCall.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 
@@ -8,7 +8,9 @@
 import io.smallrye.mutiny.CompositeException;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
+import io.smallrye.mutiny.operators.UniOperator;
 import io.smallrye.mutiny.subscription.Cancellable;
+import io.smallrye.mutiny.subscription.UniDelegatingSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 import io.smallrye.mutiny.tuples.Functions;
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOrCombination.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOrCombination.java
similarity index 95%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniOrCombination.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOrCombination.java
index 98ca87c5a..f91b66c07 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniOrCombination.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniOrCombination.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 
@@ -9,6 +9,8 @@
 
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.helpers.EmptyUniSubscription;
+import io.smallrye.mutiny.operators.AbstractUni;
+import io.smallrye.mutiny.operators.UniOperator;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 
 public class UniOrCombination<T> extends UniOperator<Void, T> {
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniRetryAtMost.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniRetryAtMost.java
similarity index 95%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniRetryAtMost.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniRetryAtMost.java
index 708fd0654..3e6651a98 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniRetryAtMost.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniRetryAtMost.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import static io.smallrye.mutiny.helpers.EmptyUniSubscription.CANCELLED;
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
@@ -9,6 +9,8 @@
 import java.util.function.Predicate;
 
 import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.operators.AbstractUni;
+import io.smallrye.mutiny.operators.UniOperator;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniRunSubscribeOn.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniRunSubscribeOn.java
similarity index 91%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniRunSubscribeOn.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniRunSubscribeOn.java
index d88b7d802..f2a676db4 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniRunSubscribeOn.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniRunSubscribeOn.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import static io.smallrye.mutiny.helpers.EmptyUniSubscription.CANCELLED;
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
@@ -7,6 +7,9 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.operators.AbstractUni;
+import io.smallrye.mutiny.operators.UniOperator;
+import io.smallrye.mutiny.subscription.UniDelegatingSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniSubscribeToCompletionStage.java b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniSubscribeToCompletionStage.java
similarity index 95%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniSubscribeToCompletionStage.java
rename to implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniSubscribeToCompletionStage.java
index 6359437b4..8e2856982 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniSubscribeToCompletionStage.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/uni/UniSubscribeToCompletionStage.java
@@ -1,4 +1,4 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.operators.uni;
 
 import static io.smallrye.mutiny.helpers.EmptyUniSubscription.CANCELLED;
 
@@ -7,6 +7,7 @@
 
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
+import io.smallrye.mutiny.operators.AbstractUni;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/UniDelegatingSubscriber.java b/implementation/src/main/java/io/smallrye/mutiny/subscription/UniDelegatingSubscriber.java
similarity index 82%
rename from implementation/src/main/java/io/smallrye/mutiny/operators/UniDelegatingSubscriber.java
rename to implementation/src/main/java/io/smallrye/mutiny/subscription/UniDelegatingSubscriber.java
index 8fb66ddbc..b02aa75c9 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/UniDelegatingSubscriber.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/subscription/UniDelegatingSubscriber.java
@@ -1,10 +1,7 @@
-package io.smallrye.mutiny.operators;
+package io.smallrye.mutiny.subscription;
 
 import static io.smallrye.mutiny.helpers.ParameterValidation.nonNull;
 
-import io.smallrye.mutiny.subscription.UniSubscriber;
-import io.smallrye.mutiny.subscription.UniSubscription;
-
 public class UniDelegatingSubscriber<I, O> implements UniSubscriber<I> {
 
     private final UniSubscriber<? super O> delegate;
diff --git a/implementation/src/test/java/io/smallrye/mutiny/groups/UniMemoizeTest.java b/implementation/src/test/java/io/smallrye/mutiny/groups/UniMemoizeTest.java
index 2fb47ee07..e77a5eaf7 100644
--- a/implementation/src/test/java/io/smallrye/mutiny/groups/UniMemoizeTest.java
+++ b/implementation/src/test/java/io/smallrye/mutiny/groups/UniMemoizeTest.java
@@ -22,7 +22,7 @@
 import io.smallrye.mutiny.helpers.spies.Spy;
 import io.smallrye.mutiny.helpers.spies.UniOnSubscribeSpy;
 import io.smallrye.mutiny.helpers.test.UniAssertSubscriber;
-import io.smallrye.mutiny.operators.UniMemoizeOp;
+import io.smallrye.mutiny.operators.uni.UniMemoizeOp;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
diff --git a/implementation/src/test/java/io/smallrye/mutiny/infrastructure/UniInterceptorTest.java b/implementation/src/test/java/io/smallrye/mutiny/infrastructure/UniInterceptorTest.java
index e990c4275..3049d2a4e 100644
--- a/implementation/src/test/java/io/smallrye/mutiny/infrastructure/UniInterceptorTest.java
+++ b/implementation/src/test/java/io/smallrye/mutiny/infrastructure/UniInterceptorTest.java
@@ -7,7 +7,7 @@
 
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.operators.AbstractUni;
-import io.smallrye.mutiny.operators.UniDelegatingSubscriber;
+import io.smallrye.mutiny.subscription.UniDelegatingSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
diff --git a/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnFailureTransformTest.java b/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnFailureTransformTest.java
index 17cc06fbf..051dee124 100644
--- a/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnFailureTransformTest.java
+++ b/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnFailureTransformTest.java
@@ -18,6 +18,7 @@
 import io.smallrye.mutiny.CompositeException;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.helpers.test.UniAssertSubscriber;
+import io.smallrye.mutiny.operators.uni.UniOnFailureTransform;
 import io.smallrye.mutiny.subscription.UniEmitter;
 
 public class UniOnFailureTransformTest {
diff --git a/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnItemOrFailureInvokeTest.java b/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnItemOrFailureInvokeTest.java
index bbd198ee6..9b72ab099 100644
--- a/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnItemOrFailureInvokeTest.java
+++ b/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnItemOrFailureInvokeTest.java
@@ -18,6 +18,7 @@
 import io.smallrye.mutiny.CompositeException;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.helpers.test.UniAssertSubscriber;
+import io.smallrye.mutiny.operators.uni.UniOnItemOrFailureMap;
 import io.smallrye.mutiny.subscription.Cancellable;
 
 public class UniOnItemOrFailureInvokeTest {
diff --git a/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnItemOrFailureMapTest.java b/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnItemOrFailureMapTest.java
index c876e6909..3e849c1db 100644
--- a/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnItemOrFailureMapTest.java
+++ b/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnItemOrFailureMapTest.java
@@ -14,6 +14,7 @@
 import io.smallrye.mutiny.CompositeException;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.helpers.test.UniAssertSubscriber;
+import io.smallrye.mutiny.operators.uni.UniOnItemOrFailureMap;
 import io.smallrye.mutiny.subscription.UniEmitter;
 
 public class UniOnItemOrFailureMapTest {
diff --git a/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnItemTransformTest.java b/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnItemTransformTest.java
index 9f762271e..58e42d5c8 100644
--- a/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnItemTransformTest.java
+++ b/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnItemTransformTest.java
@@ -15,6 +15,7 @@
 
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.helpers.test.UniAssertSubscriber;
+import io.smallrye.mutiny.operators.uni.UniOnItemTransform;
 import io.smallrye.mutiny.subscription.UniEmitter;
 
 public class UniOnItemTransformTest {
diff --git a/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnSubscribeTest.java b/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnSubscribeTest.java
index 9a1a57ba9..2dad9b33b 100644
--- a/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnSubscribeTest.java
+++ b/implementation/src/test/java/io/smallrye/mutiny/operators/UniOnSubscribeTest.java
@@ -17,6 +17,8 @@
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.helpers.test.UniAssertSubscriber;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
+import io.smallrye.mutiny.operators.uni.UniOnSubscribeCall;
+import io.smallrye.mutiny.operators.uni.UniOnSubscribeInvoke;
 import io.smallrye.mutiny.subscription.UniEmitter;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
diff --git a/implementation/src/test/java/io/smallrye/mutiny/operators/UniPlugTest.java b/implementation/src/test/java/io/smallrye/mutiny/operators/UniPlugTest.java
index 7979177d6..aca1ddad1 100644
--- a/implementation/src/test/java/io/smallrye/mutiny/operators/UniPlugTest.java
+++ b/implementation/src/test/java/io/smallrye/mutiny/operators/UniPlugTest.java
@@ -7,6 +7,7 @@
 
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.helpers.test.UniAssertSubscriber;
+import io.smallrye.mutiny.subscription.UniDelegatingSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 
 class UniPlugTest {