9 files changed, 18 insertions, 18 deletions
diff --git a/bench/Main.hs b/bench/Main.hs
index e5ef4d1..ef03b1a 100644
--- a/bench/Main.hs
+++ b/bench/Main.hs
@@ -15,7 +15,7 @@ import Numeric.LinearAlgebra qualified as LA
 import Test.Tasty.Bench
 import Text.Show (showListWith)
 
-import Data.Array.Mixed.XArray (XArray(..))
+import Data.Array.XArray (XArray(..))
 import Data.Array.Nested
 import Data.Array.Nested.Mixed (Mixed(M_Primitive), mliftPrim, mliftPrim2, toPrimitive)
 import Data.Array.Nested.Ranked (liftRanked1, liftRanked2)
diff --git a/ox-arrays.cabal b/ox-arrays.cabal
index f62f961..9cfc7dd 100644
--- a/ox-arrays.cabal
+++ b/ox-arrays.cabal
@@ -47,19 +47,19 @@ library
     -- put this module on top so ghci considers it the "main" module
     Data.Array.Nested
 
-    Data.Array.Mixed.Internal.Arith
+    Data.Array.Arith
     Data.Array.Mixed.Lemmas
     Data.Array.Mixed.Permutation
     Data.Array.Mixed.Types
-    Data.Array.Mixed.XArray
-    Data.Array.Nested.Internal.Convert
     Data.Array.Nested.Internal.Lemmas
+    Data.Array.Nested.Convert
     Data.Array.Nested.Mixed
     Data.Array.Nested.Ranked
     Data.Array.Nested.Shaped
     Data.Array.Nested.Mixed.Shape
     Data.Array.Nested.Ranked.Shape
     Data.Array.Nested.Shaped.Shape
+    Data.Array.XArray
     Data.Bag
 
   if flag(trace-wrappers)
diff --git a/src/Data/Array/Mixed/Internal/Arith.hs b/src/Data/Array/Arith.hs
index ebda388..1eae737 100644
--- a/src/Data/Array/Mixed/Internal/Arith.hs
+++ b/src/Data/Array/Arith.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE ImportQualifiedPost #-}
-module Data.Array.Mixed.Internal.Arith (
-  module Data.Array.Mixed.Internal.Arith,
+module Data.Array.Arith (
+  module Data.Array.Arith,
   module Data.Array.Strided.Arith,
 ) where
 
diff --git a/src/Data/Array/Nested.hs b/src/Data/Array/Nested.hs
index af195ee..9faf6d7 100644
--- a/src/Data/Array/Nested.hs
+++ b/src/Data/Array/Nested.hs
@@ -105,7 +105,7 @@ import Prelude hiding (mappend, mconcat)
 
 import Data.Array.Mixed.Permutation
 import Data.Array.Mixed.Types
-import Data.Array.Nested.Internal.Convert
+import Data.Array.Nested.Convert
 import Data.Array.Nested.Mixed
 import Data.Array.Nested.Ranked
 import Data.Array.Nested.Shaped
diff --git a/src/Data/Array/Nested/Internal/Convert.hs b/src/Data/Array/Nested/Convert.hs
index 611b45e..639f5fd 100644
--- a/src/Data/Array/Nested/Internal/Convert.hs
+++ b/src/Data/Array/Nested/Convert.hs
@@ -5,7 +5,7 @@
 {-# LANGUAGE TypeAbstractions #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeOperators #-}
-module Data.Array.Nested.Internal.Convert where
+module Data.Array.Nested.Convert where
 
 import Control.Category
 import Data.Proxy
@@ -15,9 +15,9 @@ import Data.Array.Mixed.Lemmas
 import Data.Array.Mixed.Types
 import Data.Array.Nested.Internal.Lemmas
 import Data.Array.Nested.Mixed
+import Data.Array.Nested.Mixed.Shape
 import Data.Array.Nested.Ranked
 import Data.Array.Nested.Shaped
-import Data.Array.Nested.Mixed.Shape
 import Data.Array.Nested.Shaped.Shape
 
 
diff --git a/src/Data/Array/Nested/Mixed.hs b/src/Data/Array/Nested/Mixed.hs
index 50a1b71..ec19c21 100644
--- a/src/Data/Array/Nested/Mixed.hs
+++ b/src/Data/Array/Nested/Mixed.hs
@@ -42,12 +42,12 @@ import GHC.Generics (Generic)
 import GHC.TypeLits
 import Unsafe.Coerce (unsafeCoerce)
 
-import Data.Array.Mixed.Internal.Arith
+import Data.Array.Arith
 import Data.Array.Mixed.Lemmas
 import Data.Array.Mixed.Permutation
 import Data.Array.Mixed.Types
-import Data.Array.Mixed.XArray (XArray(..))
-import Data.Array.Mixed.XArray qualified as X
+import Data.Array.XArray (XArray(..))
+import Data.Array.XArray qualified as X
 import Data.Array.Nested.Mixed.Shape
 import Data.Bag
 
diff --git a/src/Data/Array/Nested/Ranked.hs b/src/Data/Array/Nested/Ranked.hs
index fb5caa9..e2074ac 100644
--- a/src/Data/Array/Nested/Ranked.hs
+++ b/src/Data/Array/Nested/Ranked.hs
@@ -41,8 +41,8 @@ import GHC.TypeNats qualified as TN
 import Data.Array.Mixed.Lemmas
 import Data.Array.Mixed.Permutation
 import Data.Array.Mixed.Types
-import Data.Array.Mixed.XArray (XArray(..))
-import Data.Array.Mixed.XArray qualified as X
+import Data.Array.XArray (XArray(..))
+import Data.Array.XArray qualified as X
 import Data.Array.Nested.Mixed
 import Data.Array.Nested.Mixed.Shape
 import Data.Array.Nested.Ranked.Shape
diff --git a/src/Data/Array/Nested/Shaped.hs b/src/Data/Array/Nested/Shaped.hs
index ba767cd..4bccbc4 100644
--- a/src/Data/Array/Nested/Shaped.hs
+++ b/src/Data/Array/Nested/Shaped.hs
@@ -41,8 +41,8 @@ import GHC.TypeLits
 import Data.Array.Mixed.Lemmas
 import Data.Array.Mixed.Permutation
 import Data.Array.Mixed.Types
-import Data.Array.Mixed.XArray (XArray)
-import Data.Array.Mixed.XArray qualified as X
+import Data.Array.XArray (XArray)
+import Data.Array.XArray qualified as X
 import Data.Array.Nested.Internal.Lemmas
 import Data.Array.Nested.Mixed
 import Data.Array.Nested.Mixed.Shape
diff --git a/src/Data/Array/Mixed/XArray.hs b/src/Data/Array/XArray.hs
index 502d5d9..d8d564e 100644
--- a/src/Data/Array/Mixed/XArray.hs
+++ b/src/Data/Array/XArray.hs
@@ -11,7 +11,7 @@
 {-# LANGUAGE TypeOperators #-}
 {-# OPTIONS_GHC -fplugin GHC.TypeLits.Normalise #-}
 {-# OPTIONS_GHC -fplugin GHC.TypeLits.KnownNat.Solver #-}
-module Data.Array.Mixed.XArray where
+module Data.Array.XArray where
 
 import Control.DeepSeq (NFData)
 import Data.Array.Internal qualified as OI
@@ -31,7 +31,7 @@ import Foreign.Storable (Storable)
 import GHC.Generics (Generic)
 import GHC.TypeLits
 
-import Data.Array.Mixed.Internal.Arith
+import Data.Array.Arith
 import Data.Array.Mixed.Lemmas
 import Data.Array.Mixed.Permutation
 import Data.Array.Mixed.Types