4 files changed, 35 insertions, 15 deletions

diff --git a/packages/base/src/Numeric/LinearAlgebra/Data.hs b/packages/base/src/Numeric/LinearAlgebra/Data.hs
index 2161e75..196ada9 100644
--- a/packages/base/src/Numeric/LinearAlgebra/Data.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/Data.hs
@@ -93,12 +93,18 @@ module Numeric.LinearAlgebra.Data(
 
 ) where
 
-import Data.Packed.Vector
-import Data.Packed.Matrix
-import Data.Packed.Numeric
-import Numeric.LinearAlgebra.Util hiding ((&),(#))
+import Internal.Tools
+import Internal.Vector
+import Internal.Vectorized
+import Internal.Matrix hiding (size)
+import Internal.Element
+import Internal.IO
+import Internal.Numeric
+import Internal.Container
+import Internal.Util hiding ((&),(#))
 import Data.Complex
-import Numeric.Sparse
-import Numeric.LinearAlgebra.Util.Modular
+import Internal.Sparse
+import Internal.Modular
+import Data.Vector.Storable(fromList)
 
 
diff --git a/packages/base/src/Numeric/LinearAlgebra/Devel.hs b/packages/base/src/Numeric/LinearAlgebra/Devel.hs
index 55894e0..4d5b5cb 100644
--- a/packages/base/src/Numeric/LinearAlgebra/Devel.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/Devel.hs
@@ -17,12 +17,22 @@ module Numeric.LinearAlgebra.Devel(
     --
     -- @ glUniformMatrix4fv 0 1 (fromIntegral gl_TRUE) \`appMatrix\` perspective 0.01 100 (pi\/2) (4\/3)
     -- @
-    module Data.Packed.Foreign,
+    module Internal.Foreign,
 
     -- * FFI tools
     -- | Illustrative usage examples can be found
     --   in the @examples\/devel@ folder included in the package.
-    module Data.Packed.Development,
+    
+    createVector, createMatrix,
+    vec, mat, omat,
+    app1, app2, app3, app4,
+    app5, app6, app7, app8, app9, app10,
+    MatrixOrder(..), orderOf, cmat, fmat,
+    matrixFromVector,
+    unsafeFromForeignPtr,
+    unsafeToForeignPtr,
+    check, (//),
+    at', atM', fi, ti,
 
     -- * ST
     -- | In-place manipulation inside the ST monad.
@@ -58,9 +68,13 @@ module Numeric.LinearAlgebra.Devel(
 
 ) where
 
-import Data.Packed.Foreign
-import Data.Packed.Development
-import Data.Packed.ST
-import Data.Packed
-import Numeric.Sparse
+import Internal.Tools
+import Internal.Foreign
+import Internal.Devel
+import Internal.ST
+import Internal.Vector
+import Internal.Matrix
+import Internal.Element
+import Internal.Sparse
+import Data.Vector.Storable (unsafeToForeignPtr, unsafeFromForeignPtr )
 
diff --git a/packages/base/src/Numeric/LinearAlgebra/HMatrix.hs b/packages/base/src/Numeric/LinearAlgebra/HMatrix.hs
index a6383c1..327f284 100644
--- a/packages/base/src/Numeric/LinearAlgebra/HMatrix.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/HMatrix.hs
@@ -17,6 +17,6 @@ module Numeric.LinearAlgebra.HMatrix (
 ) where
 
 import Numeric.LinearAlgebra
-import Numeric.LinearAlgebra.Util
+import Internal.Util
 
    
diff --git a/packages/base/src/Numeric/LinearAlgebra/Static.hs b/packages/base/src/Numeric/LinearAlgebra/Static.hs
index 49327f2..04c4151 100644
--- a/packages/base/src/Numeric/LinearAlgebra/Static.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/Static.hs
@@ -68,7 +68,7 @@ import Numeric.LinearAlgebra hiding (
     qr,size,app,mul,dot,chol,range)
 import qualified Numeric.LinearAlgebra as LA
 import Data.Proxy(Proxy)
-import Numeric.LinearAlgebra.Static.Internal
+import Internal.Static
 import Control.Arrow((***))