diff --git a/docs/oteljava/tracing-context-propagation.md b/docs/oteljava/tracing-context-propagation.md
index 8c06a280e..83e61a77c 100644
--- a/docs/oteljava/tracing-context-propagation.md
+++ b/docs/oteljava/tracing-context-propagation.md
@@ -48,9 +48,9 @@ import cats.effect.IO
 import cats.effect.IOApp
 import io.opentelemetry.api.trace.{Span => JSpan}
 import org.typelevel.otel4s.context.LocalProvider
-import org.typelevel.otel4s.oteljava.IOLocalContextStorage
 import org.typelevel.otel4s.oteljava.OtelJava
 import org.typelevel.otel4s.oteljava.context.Context
+import org.typelevel.otel4s.oteljava.context.IOLocalContextStorage
 import org.typelevel.otel4s.trace.Tracer
 
 object Main extends IOApp.Simple {
diff --git a/examples/src/main/scala/ContextStorageExample.scala b/examples/src/main/scala/ContextStorageExample.scala
index b60e01d1a..91d8bdbb6 100644
--- a/examples/src/main/scala/ContextStorageExample.scala
+++ b/examples/src/main/scala/ContextStorageExample.scala
@@ -18,9 +18,9 @@ import cats.effect.IO
 import cats.effect.IOApp
 import io.opentelemetry.api.trace.{Span => JSpan}
 import org.typelevel.otel4s.context.LocalProvider
-import org.typelevel.otel4s.oteljava.IOLocalContextStorage
 import org.typelevel.otel4s.oteljava.OtelJava
 import org.typelevel.otel4s.oteljava.context.Context
+import org.typelevel.otel4s.oteljava.context.IOLocalContextStorage
 
 object ContextStorageExample extends IOApp.Simple {
 
diff --git a/oteljava/context-storage/src/main/resources/META-INF/services/io.opentelemetry.context.ContextStorageProvider b/oteljava/context-storage/src/main/resources/META-INF/services/io.opentelemetry.context.ContextStorageProvider
index f8eaf8bae..d285fe99f 100644
--- a/oteljava/context-storage/src/main/resources/META-INF/services/io.opentelemetry.context.ContextStorageProvider
+++ b/oteljava/context-storage/src/main/resources/META-INF/services/io.opentelemetry.context.ContextStorageProvider
@@ -1 +1 @@
-org.typelevel.otel4s.oteljava.IOLocalContextStorageProvider
+org.typelevel.otel4s.oteljava.context.IOLocalContextStorageProvider
diff --git a/oteljava/context-storage/src/main/scala/org/typelevel/otel4s/oteljava/IOLocalContextStorage.scala b/oteljava/context-storage/src/main/scala/org/typelevel/otel4s/oteljava/context/IOLocalContextStorage.scala
similarity index 96%
rename from oteljava/context-storage/src/main/scala/org/typelevel/otel4s/oteljava/IOLocalContextStorage.scala
rename to oteljava/context-storage/src/main/scala/org/typelevel/otel4s/oteljava/context/IOLocalContextStorage.scala
index 6dab114e5..e020a0a54 100644
--- a/oteljava/context-storage/src/main/scala/org/typelevel/otel4s/oteljava/IOLocalContextStorage.scala
+++ b/oteljava/context-storage/src/main/scala/org/typelevel/otel4s/oteljava/context/IOLocalContextStorage.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.typelevel.otel4s.oteljava
+package org.typelevel.otel4s.oteljava.context
 
 import cats.effect.IOLocal
 import cats.effect.LiftIO
@@ -25,8 +25,6 @@ import io.opentelemetry.context.{Context => JContext}
 import io.opentelemetry.context.ContextStorage
 import io.opentelemetry.context.Scope
 import org.typelevel.otel4s.context.LocalProvider
-import org.typelevel.otel4s.oteljava.context.Context
-import org.typelevel.otel4s.oteljava.context.LocalContext
 
 /** A `ContextStorage` backed by an [[cats.effect.IOLocal `IOLocal`]] of a
   * [[org.typelevel.otel4s.oteljava.context.Context `Context`]] that also provides [[cats.mtl.Local `Local`]] instances
diff --git a/oteljava/context-storage/src/main/scala/org/typelevel/otel4s/oteljava/IOLocalContextStorageProvider.scala b/oteljava/context-storage/src/main/scala/org/typelevel/otel4s/oteljava/context/IOLocalContextStorageProvider.scala
similarity index 93%
rename from oteljava/context-storage/src/main/scala/org/typelevel/otel4s/oteljava/IOLocalContextStorageProvider.scala
rename to oteljava/context-storage/src/main/scala/org/typelevel/otel4s/oteljava/context/IOLocalContextStorageProvider.scala
index 49e9eeb2f..c75f59d75 100644
--- a/oteljava/context-storage/src/main/scala/org/typelevel/otel4s/oteljava/IOLocalContextStorageProvider.scala
+++ b/oteljava/context-storage/src/main/scala/org/typelevel/otel4s/oteljava/context/IOLocalContextStorageProvider.scala
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package org.typelevel.otel4s.oteljava
+package org.typelevel.otel4s.oteljava.context
 
 import cats.effect.IOLocal
 import cats.effect.SyncIO
 import cats.syntax.all._
 import io.opentelemetry.context.ContextStorage
 import io.opentelemetry.context.ContextStorageProvider
-import org.typelevel.otel4s.oteljava.context.Context
 
 object IOLocalContextStorageProvider {
   private lazy val localContext: IOLocal[Context] =
diff --git a/oteljava/context-storage/src/test/scala/org/typelevel/otel4s/oteljava/IOLocalContextStorageSuite.scala b/oteljava/context-storage/src/test/scala/org/typelevel/otel4s/oteljava/context/IOLocalContextStorageSuite.scala
similarity index 98%
rename from oteljava/context-storage/src/test/scala/org/typelevel/otel4s/oteljava/IOLocalContextStorageSuite.scala
rename to oteljava/context-storage/src/test/scala/org/typelevel/otel4s/oteljava/context/IOLocalContextStorageSuite.scala
index a6f6a913f..311ae1cbb 100644
--- a/oteljava/context-storage/src/test/scala/org/typelevel/otel4s/oteljava/IOLocalContextStorageSuite.scala
+++ b/oteljava/context-storage/src/test/scala/org/typelevel/otel4s/oteljava/context/IOLocalContextStorageSuite.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.typelevel.otel4s.oteljava
+package org.typelevel.otel4s.oteljava.context
 
 import cats.effect.IO
 import cats.effect.SyncIO
@@ -23,8 +23,6 @@ import io.opentelemetry.context.ContextStorage
 import munit.CatsEffectSuite
 import munit.Location
 import org.typelevel.otel4s.context.Key
-import org.typelevel.otel4s.oteljava.context.Context
-import org.typelevel.otel4s.oteljava.context.LocalContext
 
 import scala.util.Using