diff --git a/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java
index 2d35b8d6be..245c41305b 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java
@@ -16,7 +16,6 @@
 
 import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.exceptions.*;
-import io.reactivex.rxjava3.internal.disposables.DisposableContainer;
 import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.util.*;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableContainer.java b/src/main/java/io/reactivex/rxjava3/disposables/DisposableContainer.java
similarity index 88%
rename from src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableContainer.java
rename to src/main/java/io/reactivex/rxjava3/disposables/DisposableContainer.java
index 9aa145556b..d7099fbadc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableContainer.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/DisposableContainer.java
@@ -11,9 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.rxjava3.internal.disposables;
-
-import io.reactivex.rxjava3.disposables.Disposable;
+package io.reactivex.rxjava3.disposables;
 
 /**
  * Common interface to add and remove disposables from a container.
@@ -38,7 +36,7 @@ public interface DisposableContainer {
     boolean remove(Disposable d);
 
     /**
-     * Removes (but does not dispose) the given disposable if it is part of this
+     * Removes but does not dispose the given disposable if it is part of this
      * container.
      * @param d the disposable to remove, not null
      * @return true if the operation was successful
diff --git a/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java
index c1233577b2..f3afcbf2c0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java
@@ -14,7 +14,7 @@
 
 import java.util.*;
 
-import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java
index 46fe9267a6..d811c8e782 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java
@@ -17,7 +17,7 @@
 
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.core.Scheduler;
-import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.internal.disposables.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java
index d5935e2f89..45072a2abd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java
@@ -16,8 +16,7 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReferenceArray;
 
-import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.internal.disposables.DisposableContainer;
+import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class ScheduledRunnable extends AtomicReferenceArray<Object>