96 files changed, 325 insertions, 322 deletions

diff --git a/HSSL.cabal b/HSSL.cabal
index aac2155..43569fe 100644
--- a/HSSL.cabal
+++ b/HSSL.cabal
@@ -1,4 +1,4 @@
-Name:               HSSL
+Name:               hssl
 Version:            0.1
 License:            GPL
 License-file:       LICENSE
@@ -9,6 +9,8 @@ Homepage:           http://dis.um.es/~alberto/GSLHaskell
 Synopsis:           Simple Scientific Library
 Description:        A high level functional interface to some linear algebra computations
                     and other numerical routines, internally implemented using GSL, BLAS and LAPACK.
+                    .
+                    More information: <http://dis.um.es/~alberto/GSLHaskell>
 Category:           Numerical, Math
 tested-with:        GHC ==6.6.1
 Build-Depends:      base, haskell98
@@ -23,52 +25,52 @@ Exposed-modules:    Data.Packed.Internal,
                     Data.Packed,
                     Data.Packed.Vector,
                     Data.Packed.Matrix,
-                    GSL.Vector,
-                    GSL.Matrix,
-                    GSL.Differentiation,
-                    GSL.Integration,
-                    GSL.Fourier,
-                    GSL.Polynomials,
-                    GSL.Minimization,
-                    GSL.Special,
-                    GSL.Special.Internal,
-                    GSL.Special.Gamma,
-                    GSL.Special.Erf,
-                    GSL.Special.Airy,
-                    GSL.Special.Exp,
-                    GSL.Special.Bessel,
-                    GSL.Special.Clausen,
-                    GSL.Special.Coulomb,
-                    GSL.Special.Coupling,
-                    GSL.Special.Dawson,
-                    GSL.Special.Debye,
-                    GSL.Special.Dilog,
-                    GSL.Special.Elementary,
-                    GSL.Special.Ellint,
-                    GSL.Special.Expint,
-                    GSL.Special.Fermi_dirac,
-                    GSL.Special.Gegenbauer,
-                    GSL.Special.Hyperg,
-                    GSL.Special.Laguerre,
-                    GSL.Special.Lambert,
-                    GSL.Special.Pow_int,
-                    GSL.Special.Psi,
-                    GSL.Special.Synchrotron,
-                    GSL.Special.Trig,
-                    GSL.Special.Zeta,
-                    GSL.Special.Log,
-                    GSL.Special.Legendre,
-                    GSL,
-                    LinearAlgebra,
-                    LinearAlgebra.LAPACK,
-                    LinearAlgebra.Linear,
-                    LinearAlgebra.Instances,
-                    LinearAlgebra.Interface,
-                    LinearAlgebra.Algorithms,
+                    Numeric.GSL.Vector,
+                    Numeric.GSL.Matrix,
+                    Numeric.GSL.Differentiation,
+                    Numeric.GSL.Integration,
+                    Numeric.GSL.Fourier,
+                    Numeric.GSL.Polynomials,
+                    Numeric.GSL.Minimization,
+                    Numeric.GSL.Special,
+                    Numeric.GSL.Special.Internal,
+                    Numeric.GSL.Special.Gamma,
+                    Numeric.GSL.Special.Erf,
+                    Numeric.GSL.Special.Airy,
+                    Numeric.GSL.Special.Exp,
+                    Numeric.GSL.Special.Bessel,
+                    Numeric.GSL.Special.Clausen,
+                    Numeric.GSL.Special.Coulomb,
+                    Numeric.GSL.Special.Coupling,
+                    Numeric.GSL.Special.Dawson,
+                    Numeric.GSL.Special.Debye,
+                    Numeric.GSL.Special.Dilog,
+                    Numeric.GSL.Special.Elementary,
+                    Numeric.GSL.Special.Ellint,
+                    Numeric.GSL.Special.Expint,
+                    Numeric.GSL.Special.Fermi_dirac,
+                    Numeric.GSL.Special.Gegenbauer,
+                    Numeric.GSL.Special.Hyperg,
+                    Numeric.GSL.Special.Laguerre,
+                    Numeric.GSL.Special.Lambert,
+                    Numeric.GSL.Special.Pow_int,
+                    Numeric.GSL.Special.Psi,
+                    Numeric.GSL.Special.Synchrotron,
+                    Numeric.GSL.Special.Trig,
+                    Numeric.GSL.Special.Zeta,
+                    Numeric.GSL.Special.Log,
+                    Numeric.GSL.Special.Legendre,
+                    Numeric.GSL,
+                    Numeric.LinearAlgebra,
+                    Numeric.LinearAlgebra.LAPACK,
+                    Numeric.LinearAlgebra.Linear,
+                    Numeric.LinearAlgebra.Instances,
+                    Numeric.LinearAlgebra.Interface,
+                    Numeric.LinearAlgebra.Algorithms,
                     Graphics.Plot
 C-sources:          lib/Data/Packed/Internal/aux.c,
-                    lib/LinearAlgebra/LAPACK/lapack-aux.c,
-                    lib/GSL/gsl-aux.c
+                    lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c,
+                    lib/Numeric/GSL/gsl-aux.c
 extra-libraries:    gsl cblas lapack
 cc-options:         -O4
 ghc-prof-options:   -auto-all
diff --git a/README b/README
index 07f557f..8c6f954 100644
--- a/README
+++ b/README
@@ -17,8 +17,8 @@ $ runhaskell Setup.hs install --user
 
 USING ATLAS
 
-$ ln -s /usr/lib/atlas/libblas.so.3.0 $HOME/lib/HSSL-0.1/ghc-6.6.1/libcblas.so
-$ ln -s /usr/lib/atlas/liblapack.so.3.0 $HOME/lib/HSSL-0.1/ghc-6.6.1/liblapack.so
+$ ln -s /usr/lib/atlas/libblas.so.3.0 $HOME/lib/hssl-0.1/ghc-6.6.1/libcblas.so
+$ ln -s /usr/lib/atlas/liblapack.so.3.0 $HOME/lib/hssl-0.1/ghc-6.6.1/liblapack.so
 
 TESTS
 
diff --git a/examples/deriv.hs b/examples/deriv.hs
index 472a284..c9456d1 100644
--- a/examples/deriv.hs
+++ b/examples/deriv.hs
@@ -1,6 +1,6 @@
 -- Numerical differentiation
 
-import GSL
+import Numeric.GSL
 
 d :: (Double -> Double) -> (Double -> Double)
 d f x = fst $ derivCentral 0.01 f x
diff --git a/examples/error.hs b/examples/error.hs
index bcfe224..16305dc 100644
--- a/examples/error.hs
+++ b/examples/error.hs
@@ -1,4 +1,4 @@
-import GSL
+import Numeric.GSL
 import Prelude hiding (catch)
 import Control.Exception
 
diff --git a/examples/integrate.hs b/examples/integrate.hs
index 6da88ad..10f0269 100644
--- a/examples/integrate.hs
+++ b/examples/integrate.hs
@@ -1,5 +1,5 @@
 -- Numerical integration
-import GSL
+import Numeric.GSL
 
 quad f a b = fst $ integrateQAGS 1E-9 100 f a b  
 
diff --git a/examples/kalman.hs b/examples/kalman.hs
index ccb8083..e191cbb 100644
--- a/examples/kalman.hs
+++ b/examples/kalman.hs
@@ -1,8 +1,5 @@
-import LinearAlgebra
+import Numeric.LinearAlgebra
 import Graphics.Plot
-import LinearAlgebra.Instances
-
---import GSLHaskell
 
 vector l = fromList l :: Vector Double
 matrix ls = fromLists ls :: Matrix Double
diff --git a/examples/listlike.hs b/examples/listlike.hs
index 6c54f17..43216cb 100644
--- a/examples/listlike.hs
+++ b/examples/listlike.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -fglasgow-exts #-}
 
 import qualified Data.ListLike as LL
-import LinearAlgebra
+import Numeric.LinearAlgebra
 import Data.Monoid
 import Data.Packed.Internal.Vector
 import Foreign
diff --git a/examples/minimize.hs b/examples/minimize.hs
index 0429a24..d7bc350 100644
--- a/examples/minimize.hs
+++ b/examples/minimize.hs
@@ -1,6 +1,6 @@
 -- the multidimensional minimization example in the GSL manual
-import GSL
-import LinearAlgebra
+import Numeric.GSL
+import Numeric.LinearAlgebra
 import Graphics.Plot
 
 -- the function to be minimized 
diff --git a/examples/pca1.hs b/examples/pca1.hs
index 2c5074d..4ad8720 100644
--- a/examples/pca1.hs
+++ b/examples/pca1.hs
@@ -1,6 +1,6 @@
 -- Principal component analysis
 
-import LinearAlgebra
+import Numeric.LinearAlgebra
 import System.Directory(doesFileExist)
 import System(system)
 import Control.Monad(when)
@@ -26,7 +26,7 @@ pca n dataSet = (encode,decode)
     decode x = x <> vp + m
     m = mean dataSet
     c = cov dataSet
-    (_,v) = eigS c
+    (_,v) = eigSH c
     vp = takeRows n (trans v)
 
 main = do
diff --git a/examples/pca2.hs b/examples/pca2.hs
index bd498e4..8c20370 100644
--- a/examples/pca2.hs
+++ b/examples/pca2.hs
@@ -1,6 +1,6 @@
 -- Improved PCA, including illustrative graphics
 
-import LinearAlgebra
+import Numeric.LinearAlgebra
 import Graphics.Plot
 import System.Directory(doesFileExist)
 import System(system)
@@ -24,7 +24,7 @@ type Stat = (Vec, [Double], Mat)
 stat :: Mat -> Stat
 stat x = (m, toList s, trans v) where   
     m = mean x
-    (s,v) = eigS (cov x)   
+    (s,v) = eigSH' (cov x)   
 
 -- creates the compression and decompression functions from the desired reconstruction 
 -- quality and the statistics of a data set
diff --git a/examples/pinv1.hs b/examples/pinv1.hs
index 76fa0a9..301eac8 100644
--- a/examples/pinv1.hs
+++ b/examples/pinv1.hs
@@ -1,5 +1,5 @@
 -- initial check for the polynomial model example
-import LinearAlgebra
+import Numeric.LinearAlgebra
 
 
 prepSyst :: Int -> Matrix Double -> (Matrix Double, Vector Double)
diff --git a/examples/pinv2.hs b/examples/pinv2.hs
index c1038d1..7423540 100644
--- a/examples/pinv2.hs
+++ b/examples/pinv2.hs
@@ -1,5 +1,5 @@
 -- MSE polynomial model using the pseudoinverse
-import LinearAlgebra
+import Numeric.LinearAlgebra
 import Graphics.Plot
 
 expand :: Int -> Vector Double -> Matrix Double
diff --git a/examples/plot.hs b/examples/plot.hs
index 1177c11..e4025fd 100644
--- a/examples/plot.hs
+++ b/examples/plot.hs
@@ -1,6 +1,6 @@
-import LinearAlgebra
+import Numeric.LinearAlgebra
 import Graphics.Plot
-import GSL(erf_Z, erf)
+import Numeric.GSL(erf_Z, erf)
 
 sombrero n = f x y where 
     (x,y) = meshdom range range
diff --git a/examples/tests.hs b/examples/tests.hs
index e66774b..b088069 100644
--- a/examples/tests.hs
+++ b/examples/tests.hs
@@ -3,11 +3,11 @@
 module Main where
 
 import Data.Packed.Internal((>|<), fdat, cdat, multiply', multiplyG, MatrixOrder(..),debug)
-import GSL hiding (sin,cos,exp,choose)
-import LinearAlgebra
-import LinearAlgebra.Linear(Linear)
-import LinearAlgebra.LAPACK
-import GSL.Matrix
+import Numeric.GSL hiding (sin,cos,exp,choose)
+import Numeric.LinearAlgebra
+import Numeric.LinearAlgebra.Linear(Linear)
+import Numeric.LinearAlgebra.LAPACK
+import Numeric.GSL.Matrix
 import Test.QuickCheck hiding (test)
 import Test.HUnit hiding ((~:),test)
 import System.Random(randomRs,mkStdGen)
diff --git a/lib/Data/Packed/Vector.hs b/lib/Data/Packed/Vector.hs
index 3fc625c..c893fe7 100644
--- a/lib/Data/Packed/Vector.hs
+++ b/lib/Data/Packed/Vector.hs
@@ -24,7 +24,7 @@ module Data.Packed.Vector (
 
 import Data.Packed.Internal
 import Complex
-import GSL.Vector
+import Numeric.GSL.Vector
 
 {- | Creates a real vector containing a range of values:
 
diff --git a/lib/GSL.hs b/lib/GSL.hs
deleted file mode 100644
index f04cf26..0000000
--- a/lib/GSL.hs
+++ /dev/null
@@ -1,38 +0,0 @@
-{- |
-
-Module      :  GSL
-Copyright   :  (c) Alberto Ruiz 2006-7
-License     :  GPL-style
-
-Maintainer  :  Alberto Ruiz (aruiz at um dot es)
-Stability   :  provisional
-Portability :  uses -fffi and -fglasgow-exts
-
-This module reexports all the available GSL functions (except those in "LinearAlgebra").
-
--}
-
-module GSL (
-  module GSL.Integration
-, module GSL.Differentiation
-, module GSL.Fourier
-, module GSL.Polynomials
-, module GSL.Minimization
-, module GSL.Special
-, module Complex
-, setErrorHandlerOff
-) where
-
-import GSL.Integration
-import GSL.Differentiation
-import GSL.Special
-import GSL.Fourier
-import GSL.Polynomials
-import GSL.Minimization
-import Complex
-import GSL.Special
-
-
--- | This action removes the GSL default error handler (which aborts the program), so that
--- GSL errors can be handled by Haskell (using Control.Exception) and ghci doesn't abort.
-foreign import ccall "GSL/gsl-aux.h no_abort_on_error" setErrorHandlerOff :: IO ()
diff --git a/lib/GSL/Special.hs b/lib/GSL/Special.hs
deleted file mode 100644
index fa002b9..0000000
--- a/lib/GSL/Special.hs
+++ /dev/null
@@ -1,74 +0,0 @@
------------------------------------------------------------------------------
-{- |
-Module      :  GSL.Special
-Copyright   :  (c) Alberto Ruiz 2006
-License     :  GPL-style
-
-Maintainer  :  Alberto Ruiz (aruiz at um dot es)
-Stability   :  provisional
-Portability :  uses ffi
-
-Wrappers for selected special functions.
-
-<http://www.gnu.org/software/gsl/manual/html_node/Special-Functions.html#Special-Functions>
--}
------------------------------------------------------------------------------
-
-module GSL.Special (
-  module GSL.Special.Airy
-, module GSL.Special.Bessel
-, module GSL.Special.Clausen
-, module GSL.Special.Coulomb
-, module GSL.Special.Coupling
-, module GSL.Special.Dawson
-, module GSL.Special.Debye
-, module GSL.Special.Dilog
-, module GSL.Special.Elementary
-, module GSL.Special.Ellint
-, module GSL.Special.Erf
-, module GSL.Special.Exp
-, module GSL.Special.Expint
-, module GSL.Special.Fermi_dirac
-, module GSL.Special.Gamma
-, module GSL.Special.Gegenbauer
-, module GSL.Special.Hyperg
-, module GSL.Special.Laguerre
-, module GSL.Special.Lambert
-, module GSL.Special.Legendre
-, module GSL.Special.Log
-, module GSL.Special.Pow_int
-, module GSL.Special.Psi
-, module GSL.Special.Synchrotron
-, module GSL.Special.Trig
-, module GSL.Special.Zeta
-)
-where
-
-import Foreign
-import GSL.Special.Internal
-import GSL.Special.Airy
-import GSL.Special.Bessel
-import GSL.Special.Clausen
-import GSL.Special.Coulomb
-import GSL.Special.Coupling
-import GSL.Special.Dawson
-import GSL.Special.Debye
-import GSL.Special.Dilog
-import GSL.Special.Elementary
-import GSL.Special.Ellint
-import GSL.Special.Erf
-import GSL.Special.Exp
-import GSL.Special.Expint
-import GSL.Special.Fermi_dirac
-import GSL.Special.Gamma
-import GSL.Special.Gegenbauer
-import GSL.Special.Hyperg
-import GSL.Special.Laguerre
-import GSL.Special.Lambert
-import GSL.Special.Legendre
-import GSL.Special.Log
-import GSL.Special.Pow_int
-import GSL.Special.Psi
-import GSL.Special.Synchrotron
-import GSL.Special.Trig
-import GSL.Special.Zeta
diff --git a/lib/Graphics/Plot.hs b/lib/Graphics/Plot.hs
index 9f719ab..71ad0fc 100644
--- a/lib/Graphics/Plot.hs
+++ b/lib/Graphics/Plot.hs
@@ -14,7 +14,7 @@
 
 module Graphics.Plot(
 
-    gnuplotX, mplot,
+    mplot,
 
     plot, parametricPlot, 
 
@@ -22,12 +22,14 @@ module Graphics.Plot(
 
     matrixToPGM, imshow,
 
+    gnuplotX
+
 ) where
 
 import Data.Packed.Vector
 import Data.Packed.Matrix
-import LinearAlgebra.Linear(outer)
-import GSL.Vector(FunCodeS(Max,Min),toScalarR)
+import Numeric.LinearAlgebra.Linear(outer)
+import Numeric.GSL.Vector(FunCodeS(Max,Min),toScalarR)
 import Data.List(intersperse)
 import System
 import Data.IORef
diff --git a/lib/Numeric/GSL.hs b/lib/Numeric/GSL.hs
new file mode 100644
index 0000000..4bc3940
--- /dev/null
+++ b/lib/Numeric/GSL.hs
@@ -0,0 +1,38 @@
+{- |
+
+Module      :  Numeric.GSL
+Copyright   :  (c) Alberto Ruiz 2006-7
+License     :  GPL-style
+
+Maintainer  :  Alberto Ruiz (aruiz at um dot es)
+Stability   :  provisional
+Portability :  uses -fffi and -fglasgow-exts
+
+This module reexports all the available Numeric.GSL functions (except those in "LinearAlgebra").
+
+-}
+
+module Numeric.GSL (
+  module Numeric.GSL.Integration
+, module Numeric.GSL.Differentiation
+, module Numeric.GSL.Fourier
+, module Numeric.GSL.Polynomials
+, module Numeric.GSL.Minimization
+, module Numeric.GSL.Special
+, module Complex
+, setErrorHandlerOff
+) where
+
+import Numeric.GSL.Integration
+import Numeric.GSL.Differentiation
+import Numeric.GSL.Special
+import Numeric.GSL.Fourier
+import Numeric.GSL.Polynomials
+import Numeric.GSL.Minimization
+import Complex
+import Numeric.GSL.Special
+
+
+-- | This action removes the GSL default error handler (which aborts the program), so that
+-- GSL errors can be handled by Haskell (using Control.Exception) and ghci doesn't abort.
+foreign import ccall "GSL/gsl-aux.h no_abort_on_error" setErrorHandlerOff :: IO ()
diff --git a/lib/GSL/Differentiation.hs b/lib/Numeric/GSL/Differentiation.hs
index e8e22d2..e7fea92 100644
--- a/lib/GSL/Differentiation.hs
+++ b/lib/Numeric/GSL/Differentiation.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS  #-}
 -----------------------------------------------------------------------------
 {- |
-Module      :  GSL.Differentiation
+Module      :  Numeric.GSL.Differentiation
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 
@@ -16,7 +16,7 @@ Numerical differentiation.
 From the GSL manual: \"The functions described in this chapter compute numerical derivatives by finite differencing. An adaptive algorithm is used to find the best choice of finite difference and to estimate the error in the derivative.\"
 -}
 -----------------------------------------------------------------------------
-module GSL.Differentiation (
+module Numeric.GSL.Differentiation (
     derivCentral,
     derivForward,
     derivBackward
diff --git a/lib/GSL/Fourier.hs b/lib/Numeric/GSL/Fourier.hs
index 9788602..e975fbf 100644
--- a/lib/GSL/Fourier.hs
+++ b/lib/Numeric/GSL/Fourier.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 {- |
-Module      : GSL.Fourier
+Module      : Numeric.GSL.Fourier
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 
@@ -15,7 +15,7 @@ Fourier Transform.
 
 -}
 -----------------------------------------------------------------------------
-module GSL.Fourier (
+module Numeric.GSL.Fourier (
     fft,
     ifft
 ) where
diff --git a/lib/GSL/Integration.hs b/lib/Numeric/GSL/Integration.hs
index 4152c9d..d756417 100644
--- a/lib/GSL/Integration.hs
+++ b/lib/Numeric/GSL/Integration.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS #-}
 -----------------------------------------------------------------------------
 {- |
-Module      :  GSL.Integration
+Module      :  Numeric.GSL.Integration
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 
@@ -15,7 +15,7 @@ Numerical integration routines.
 -}
 -----------------------------------------------------------------------------
 
-module GSL.Integration (
+module Numeric.GSL.Integration (
     integrateQNG,
     integrateQAGS
 ) where
diff --git a/lib/GSL/Matrix.hs b/lib/Numeric/GSL/Matrix.hs
index 3a54226..eb1931a 100644
--- a/lib/GSL/Matrix.hs
+++ b/lib/Numeric/GSL/Matrix.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  GSL.Matrix
+-- Module      :  Numeric.GSL.Matrix
 -- Copyright   :  (c) Alberto Ruiz 2007
 -- License     :  GPL-style
 --
@@ -8,11 +8,12 @@
 -- Stability   :  provisional
 -- Portability :  portable (uses FFI)
 --
--- A few linear algebra computations based on the GSL (<http://www.gnu.org/software/gsl>).
+-- A few linear algebra computations based on the Numeric.GSL (<http://www.gnu.org/software/Numeric.GSL>).
 --
 -----------------------------------------------------------------------------
+-- #hide
 
-module GSL.Matrix(
+module Numeric.GSL.Matrix(
     eigSg, eigHg,
     svdg,
     qr,
@@ -23,7 +24,7 @@ module GSL.Matrix(
 
 import Data.Packed.Internal
 import Data.Packed.Matrix(fromLists,ident,takeDiag)
-import GSL.Vector
+import Numeric.GSL.Vector
 import Foreign
 import Complex
 
@@ -228,7 +229,7 @@ luCaux x = unsafePerformIO $ do
         c = cols x
 foreign import ccall "gsl-aux.h luCaux" c_luCaux :: TCMCV
 
-{- | The LU decomposition of a square matrix. Is based on /gsl_linalg_LU_decomp/ and  /gsl_linalg_complex_LU_decomp/ as described in <http://www.gnu.org/software/gsl/manual/gsl-ref_13.html#SEC223>.
+{- | The LU decomposition of a square matrix. Is based on /gsl_linalg_LU_decomp/ and  /gsl_linalg_complex_LU_decomp/ as described in <http://www.gnu.org/software/Numeric.GSL/manual/Numeric.GSL-ref_13.html#SEC223>.
 
 @\> let m = 'fromLists' [[1,2,-3],[2+3*i,-7,0],[1,-i,2*i]]
 \> let (l,u,p,s) = luR m@
diff --git a/lib/GSL/Minimization.hs b/lib/Numeric/GSL/Minimization.hs
index aa89475..23ca51b 100644
--- a/lib/GSL/Minimization.hs
+++ b/lib/Numeric/GSL/Minimization.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 {- |
-Module      :  GSL.Minimization
+Module      :  Numeric.GSL.Minimization
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 
@@ -15,7 +15,7 @@ Minimization of a multidimensional function Minimization of a multidimensional f
 
 -}
 -----------------------------------------------------------------------------
-module GSL.Minimization (
+module Numeric.GSL.Minimization (
     minimizeConjugateGradient,
     minimizeNMSimplex
 ) where
diff --git a/lib/GSL/Polynomials.hs b/lib/Numeric/GSL/Polynomials.hs
index a87fa56..42694f0 100644
--- a/lib/GSL/Polynomials.hs
+++ b/lib/Numeric/GSL/Polynomials.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 {- |
-Module      :  GSL.Polynomials
+Module      :  Numeric.GSL.Polynomials
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 
@@ -15,7 +15,7 @@ Polynomials.
 
 -}
 -----------------------------------------------------------------------------
-module GSL.Polynomials (
+module Numeric.GSL.Polynomials (
     polySolve
 ) where
 
diff --git a/lib/Numeric/GSL/Special.hs b/lib/Numeric/GSL/Special.hs
new file mode 100644
index 0000000..b6cea2b
--- /dev/null
+++ b/lib/Numeric/GSL/Special.hs
@@ -0,0 +1,74 @@
+-----------------------------------------------------------------------------
+{- |
+Module      :  Numeric.GSL.Special
+Copyright   :  (c) Alberto Ruiz 2006
+License     :  GPL-style
+
+Maintainer  :  Alberto Ruiz (aruiz at um dot es)
+Stability   :  provisional
+Portability :  uses ffi
+
+Wrappers for selected special functions.
+
+<http://www.gnu.org/software/gsl/manual/html_node/Special-Functions.html#Special-Functions>
+-}
+-----------------------------------------------------------------------------
+
+module Numeric.GSL.Special (
+  module Numeric.GSL.Special.Airy
+, module Numeric.GSL.Special.Bessel
+, module Numeric.GSL.Special.Clausen
+, module Numeric.GSL.Special.Coulomb
+, module Numeric.GSL.Special.Coupling
+, module Numeric.GSL.Special.Dawson
+, module Numeric.GSL.Special.Debye
+, module Numeric.GSL.Special.Dilog
+, module Numeric.GSL.Special.Elementary
+, module Numeric.GSL.Special.Ellint
+, module Numeric.GSL.Special.Erf
+, module Numeric.GSL.Special.Exp
+, module Numeric.GSL.Special.Expint
+, module Numeric.GSL.Special.Fermi_dirac
+, module Numeric.GSL.Special.Gamma
+, module Numeric.GSL.Special.Gegenbauer
+, module Numeric.GSL.Special.Hyperg
+, module Numeric.GSL.Special.Laguerre
+, module Numeric.GSL.Special.Lambert
+, module Numeric.GSL.Special.Legendre
+, module Numeric.GSL.Special.Log
+, module Numeric.GSL.Special.Pow_int
+, module Numeric.GSL.Special.Psi
+, module Numeric.GSL.Special.Synchrotron
+, module Numeric.GSL.Special.Trig
+, module Numeric.GSL.Special.Zeta
+)
+where
+
+import Foreign
+import Numeric.GSL.Special.Internal
+import Numeric.GSL.Special.Airy
+import Numeric.GSL.Special.Bessel
+import Numeric.GSL.Special.Clausen
+import Numeric.GSL.Special.Coulomb
+import Numeric.GSL.Special.Coupling
+import Numeric.GSL.Special.Dawson
+import Numeric.GSL.Special.Debye
+import Numeric.GSL.Special.Dilog
+import Numeric.GSL.Special.Elementary
+import Numeric.GSL.Special.Ellint
+import Numeric.GSL.Special.Erf
+import Numeric.GSL.Special.Exp
+import Numeric.GSL.Special.Expint
+import Numeric.GSL.Special.Fermi_dirac
+import Numeric.GSL.Special.Gamma
+import Numeric.GSL.Special.Gegenbauer
+import Numeric.GSL.Special.Hyperg
+import Numeric.GSL.Special.Laguerre
+import Numeric.GSL.Special.Lambert
+import Numeric.GSL.Special.Legendre
+import Numeric.GSL.Special.Log
+import Numeric.GSL.Special.Pow_int
+import Numeric.GSL.Special.Psi
+import Numeric.GSL.Special.Synchrotron
+import Numeric.GSL.Special.Trig
+import Numeric.GSL.Special.Zeta
diff --git a/lib/GSL/Special/Airy.hs b/lib/Numeric/GSL/Special/Airy.hs
index 872f7c5..d987e1f 100644
--- a/lib/GSL/Special/Airy.hs
+++ b/lib/Numeric/GSL/Special/Airy.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Airy
+Module      :  Numeric.GSL.Special.Airy
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,7 +14,7 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Airy(
+module Numeric.GSL.Special.Airy(
   Precision (..)
 , airy_Ai_e
 , airy_Ai
@@ -43,7 +43,7 @@ module GSL.Special.Airy(
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_airy_Ai_e(double x,gsl_mode_t mode,gsl_sf_result* result);
 airy_Ai_e :: Double -> Precision -> (Double,Double)
diff --git a/lib/GSL/Special/Bessel.hs b/lib/Numeric/GSL/Special/Bessel.hs
index 4a96926..e059666 100644
--- a/lib/GSL/Special/Bessel.hs
+++ b/lib/Numeric/GSL/Special/Bessel.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Bessel
+Module      :  Numeric.GSL.Special.Bessel
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,7 +14,7 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Bessel(
+module Numeric.GSL.Special.Bessel(
   bessel_J0_e
 , bessel_J0
 , bessel_J1_e
@@ -106,7 +106,7 @@ module GSL.Special.Bessel(
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_bessel_J0_e(double x,gsl_sf_result* result);
 --
diff --git a/lib/GSL/Special/Clausen.hs b/lib/Numeric/GSL/Special/Clausen.hs
index 57c8878..3052187 100644
--- a/lib/GSL/Special/Clausen.hs
+++ b/lib/Numeric/GSL/Special/Clausen.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Clausen
+Module      :  Numeric.GSL.Special.Clausen
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,13 +14,13 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Clausen(
+module Numeric.GSL.Special.Clausen(
   clausen_e
 , clausen
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_clausen_e(double x,gsl_sf_result* result);
 --
diff --git a/lib/GSL/Special/Coulomb.hs b/lib/Numeric/GSL/Special/Coulomb.hs
index a60b724..06848cb 100644
--- a/lib/GSL/Special/Coulomb.hs
+++ b/lib/Numeric/GSL/Special/Coulomb.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Coulomb
+Module      :  Numeric.GSL.Special.Coulomb
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,7 +14,7 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Coulomb(
+module Numeric.GSL.Special.Coulomb(
   hydrogenicR_1_e
 , hydrogenicR_1
 , hydrogenicR_e
@@ -23,7 +23,7 @@ module GSL.Special.Coulomb(
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_hydrogenicR_1_e(double Z,double r,gsl_sf_result* result);
 --
diff --git a/lib/GSL/Special/Coupling.hs b/lib/Numeric/GSL/Special/Coupling.hs
index fb949d1..9578b1b 100644
--- a/lib/GSL/Special/Coupling.hs
+++ b/lib/Numeric/GSL/Special/Coupling.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Coupling
+Module      :  Numeric.GSL.Special.Coupling
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,7 +14,7 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Coupling(
+module Numeric.GSL.Special.Coupling(
   coupling_3j_e
 , coupling_3j
 , coupling_6j_e
@@ -28,7 +28,7 @@ module GSL.Special.Coupling(
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_coupling_3j_e(int two_ja,int two_jb,int two_jc,int two_ma,int two_mb,int two_mc,gsl_sf_result* result);
 coupling_3j_e :: Int -> Int -> Int -> Int -> Int -> Int -> (Double,Double)
diff --git a/lib/GSL/Special/Dawson.hs b/lib/Numeric/GSL/Special/Dawson.hs
index 69d0127..1d77a2b 100644
--- a/lib/GSL/Special/Dawson.hs
+++ b/lib/Numeric/GSL/Special/Dawson.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Dawson
+Module      :  Numeric.GSL.Special.Dawson
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,13 +14,13 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Dawson(
+module Numeric.GSL.Special.Dawson(
   dawson_e
 , dawson
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_dawson_e(double x,gsl_sf_result* result);
 --
diff --git a/lib/GSL/Special/Debye.hs b/lib/Numeric/GSL/Special/Debye.hs
index 55f5158..b8e9aca 100644
--- a/lib/GSL/Special/Debye.hs
+++ b/lib/Numeric/GSL/Special/Debye.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Debye
+Module      :  Numeric.GSL.Special.Debye
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,7 +14,7 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Debye(
+module Numeric.GSL.Special.Debye(
   debye_1_e
 , debye_1
 , debye_2_e
@@ -26,7 +26,7 @@ module GSL.Special.Debye(
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_debye_1_e(double x,gsl_sf_result* result);
 --
diff --git a/lib/GSL/Special/Dilog.hs b/lib/Numeric/GSL/Special/Dilog.hs
index 5575895..e7693da 100644
--- a/lib/GSL/Special/Dilog.hs
+++ b/lib/Numeric/GSL/Special/Dilog.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Dilog
+Module      :  Numeric.GSL.Special.Dilog
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,13 +14,13 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Dilog(
+module Numeric.GSL.Special.Dilog(
   dilog_e
 , dilog
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_dilog_e(double x,gsl_sf_result* result);
 --
diff --git a/lib/GSL/Special/Elementary.hs b/lib/Numeric/GSL/Special/Elementary.hs
index da927a2..0312ada 100644
--- a/lib/GSL/Special/Elementary.hs
+++ b/lib/Numeric/GSL/Special/Elementary.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Elementary
+Module      :  Numeric.GSL.Special.Elementary
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,14 +14,14 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Elementary(
+module Numeric.GSL.Special.Elementary(
   multiply_e
 , multiply
 , multiply_err_e
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_multiply_e(double x,double y,gsl_sf_result* result);
 --
diff --git a/lib/GSL/Special/Ellint.hs b/lib/Numeric/GSL/Special/Ellint.hs
index dddbe21..798531a 100644
--- a/lib/GSL/Special/Ellint.hs
+++ b/lib/Numeric/GSL/Special/Ellint.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Ellint
+Module      :  Numeric.GSL.Special.Ellint
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,7 +14,7 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Ellint(
+module Numeric.GSL.Special.Ellint(
   ellint_Kcomp_e
 , ellint_Kcomp
 , ellint_Ecomp_e
@@ -38,7 +38,7 @@ module GSL.Special.Ellint(
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_ellint_Kcomp_e(double k,gsl_mode_t mode,gsl_sf_result* result);
 --
diff --git a/lib/GSL/Special/Erf.hs b/lib/Numeric/GSL/Special/Erf.hs
index 6dc5abb..ec73980 100644
--- a/lib/GSL/Special/Erf.hs
+++ b/lib/Numeric/GSL/Special/Erf.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Erf
+Module      :  Numeric.GSL.Special.Erf
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,7 +14,7 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Erf(
+module Numeric.GSL.Special.Erf(
   erfc_e
 , erfc
 , log_erfc_e
@@ -30,7 +30,7 @@ module GSL.Special.Erf(
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_erfc_e(double x,gsl_sf_result* result);
 --
diff --git a/lib/GSL/Special/Exp.hs b/lib/Numeric/GSL/Special/Exp.hs
index 8c3e5b8..2787df4 100644
--- a/lib/GSL/Special/Exp.hs
+++ b/lib/Numeric/GSL/Special/Exp.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Exp
+Module      :  Numeric.GSL.Special.Exp
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,9 +14,9 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Exp(
+module Numeric.GSL.Special.Exp(
   exp_e
-, GSL.Special.Exp.exp
+, Numeric.GSL.Special.Exp.exp
 , exp_e10_e
 , exp_mult_e
 , exp_mult
@@ -36,7 +36,7 @@ module GSL.Special.Exp(
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_exp_e(double x,gsl_sf_result* result);
 exp_e :: Double -> (Double,Double)
diff --git a/lib/GSL/Special/Expint.hs b/lib/Numeric/GSL/Special/Expint.hs
index 4e1b2b5..9882d09 100644
--- a/lib/GSL/Special/Expint.hs
+++ b/lib/Numeric/GSL/Special/Expint.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Expint
+Module      :  Numeric.GSL.Special.Expint
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,7 +14,7 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Expint(
+module Numeric.GSL.Special.Expint(
   expint_E1_e
 , expint_E1
 , expint_E2_e
@@ -42,7 +42,7 @@ module GSL.Special.Expint(
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_expint_E1_e(double x,gsl_sf_result* result);
 --
diff --git a/lib/GSL/Special/Fermi_dirac.hs b/lib/Numeric/GSL/Special/Fermi_dirac.hs
index 18dc3b2..a189dd4 100644
--- a/lib/GSL/Special/Fermi_dirac.hs
+++ b/lib/Numeric/GSL/Special/Fermi_dirac.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Fermi_dirac
+Module      :  Numeric.GSL.Special.Fermi_dirac
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,7 +14,7 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Fermi_dirac(
+module Numeric.GSL.Special.Fermi_dirac(
   fermi_dirac_m1_e
 , fermi_dirac_m1
 , fermi_dirac_0_e
@@ -36,7 +36,7 @@ module GSL.Special.Fermi_dirac(
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_fermi_dirac_m1_e(double x,gsl_sf_result* result);
 --
diff --git a/lib/GSL/Special/Gamma.hs b/lib/Numeric/GSL/Special/Gamma.hs
index ae5010d..aa03892 100644
--- a/lib/GSL/Special/Gamma.hs
+++ b/lib/Numeric/GSL/Special/Gamma.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Gamma
+Module      :  Numeric.GSL.Special.Gamma
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,7 +14,7 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Gamma(
+module Numeric.GSL.Special.Gamma(
   lngamma_e
 , lngamma
 , gamma_e
@@ -58,7 +58,7 @@ module GSL.Special.Gamma(
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_lngamma_e(double x,gsl_sf_result* result);
 --
diff --git a/lib/GSL/Special/Gegenbauer.hs b/lib/Numeric/GSL/Special/Gegenbauer.hs
index 9667042..40cc1e9 100644
--- a/lib/GSL/Special/Gegenbauer.hs
+++ b/lib/Numeric/GSL/Special/Gegenbauer.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Gegenbauer
+Module      :  Numeric.GSL.Special.Gegenbauer
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,7 +14,7 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Gegenbauer(
+module Numeric.GSL.Special.Gegenbauer(
   gegenpoly_1_e
 , gegenpoly_2_e
 , gegenpoly_3_e
@@ -26,7 +26,7 @@ module GSL.Special.Gegenbauer(
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_gegenpoly_1_e(double lambda,double x,gsl_sf_result* result);
 --
diff --git a/lib/GSL/Special/Hyperg.hs b/lib/Numeric/GSL/Special/Hyperg.hs
index f9551eb..28bf984 100644
--- a/lib/GSL/Special/Hyperg.hs
+++ b/lib/Numeric/GSL/Special/Hyperg.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Hyperg
+Module      :  Numeric.GSL.Special.Hyperg
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,7 +14,7 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Hyperg(
+module Numeric.GSL.Special.Hyperg(
   hyperg_0F1_e
 , hyperg_0F1
 , hyperg_1F1_int_e
@@ -40,7 +40,7 @@ module GSL.Special.Hyperg(
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_hyperg_0F1_e(double c,double x,gsl_sf_result* result);
 --
diff --git a/lib/GSL/Special/Internal.hs b/lib/Numeric/GSL/Special/Internal.hs
index 8d81c72..a08809b 100644
--- a/lib/GSL/Special/Internal.hs
+++ b/lib/Numeric/GSL/Special/Internal.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS #-}
 -----------------------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Internal
+Module      :  Numeric.GSL.Special.Internal
 Copyright   :  (c) Alberto Ruiz 2007
 License     :  GPL-style
 
@@ -15,7 +15,7 @@ Support for Special functions.
 -}
 -----------------------------------------------------------------------------
 
-module GSL.Special.Internal (
+module Numeric.GSL.Special.Internal (
     createSFR,
     createSFR_E10,
     Precision(..),
diff --git a/lib/GSL/Special/Laguerre.hs b/lib/Numeric/GSL/Special/Laguerre.hs
index f5ab85e..320e451 100644
--- a/lib/GSL/Special/Laguerre.hs
+++ b/lib/Numeric/GSL/Special/Laguerre.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Laguerre
+Module      :  Numeric.GSL.Special.Laguerre
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,7 +14,7 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Laguerre(
+module Numeric.GSL.Special.Laguerre(
   laguerre_1_e
 , laguerre_2_e
 , laguerre_3_e
@@ -26,7 +26,7 @@ module GSL.Special.Laguerre(
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_laguerre_1_e(double a,double x,gsl_sf_result* result);
 --
diff --git a/lib/GSL/Special/Lambert.hs b/lib/Numeric/GSL/Special/Lambert.hs
index 5e8fed9..ad5579f 100644
--- a/lib/GSL/Special/Lambert.hs
+++ b/lib/Numeric/GSL/Special/Lambert.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Lambert
+Module      :  Numeric.GSL.Special.Lambert
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,7 +14,7 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Lambert(
+module Numeric.GSL.Special.Lambert(
   lambert_W0_e
 , lambert_W0
 , lambert_Wm1_e
@@ -22,7 +22,7 @@ module GSL.Special.Lambert(
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_lambert_W0_e(double x,gsl_sf_result* result);
 --
diff --git a/lib/GSL/Special/Legendre.hs b/lib/Numeric/GSL/Special/Legendre.hs
index 70315e9..0ea7557 100644
--- a/lib/GSL/Special/Legendre.hs
+++ b/lib/Numeric/GSL/Special/Legendre.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Legendre
+Module      :  Numeric.GSL.Special.Legendre
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,7 +14,7 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Legendre(
+module Numeric.GSL.Special.Legendre(
   legendre_Pl_e
 , legendre_Pl
 , legendre_P1_e
@@ -55,7 +55,7 @@ module GSL.Special.Legendre(
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_legendre_Pl_e(int l,double x,gsl_sf_result* result);
 legendre_Pl_e :: Int -> Double -> (Double,Double)
diff --git a/lib/GSL/Special/Log.hs b/lib/Numeric/GSL/Special/Log.hs
index 0d62e99..e9c345b 100644
--- a/lib/GSL/Special/Log.hs
+++ b/lib/Numeric/GSL/Special/Log.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Log
+Module      :  Numeric.GSL.Special.Log
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,9 +14,9 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Log(
+module Numeric.GSL.Special.Log(
   log_e
-, GSL.Special.Log.log
+, Numeric.GSL.Special.Log.log
 , log_abs_e
 , log_abs
 , log_1plusx_e
@@ -26,7 +26,7 @@ module GSL.Special.Log(
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_log_e(double x,gsl_sf_result* result);
 log_e :: Double -> (Double,Double)
diff --git a/lib/GSL/Special/Pow_int.hs b/lib/Numeric/GSL/Special/Pow_int.hs
index 4142c5b..384dfc4 100644
--- a/lib/GSL/Special/Pow_int.hs
+++ b/lib/Numeric/GSL/Special/Pow_int.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Pow_int
+Module      :  Numeric.GSL.Special.Pow_int
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,13 +14,13 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Pow_int(
+module Numeric.GSL.Special.Pow_int(
   pow_int_e
 , pow_int
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_pow_int_e(double x,int n,gsl_sf_result* result);
 --
diff --git a/lib/GSL/Special/Psi.hs b/lib/Numeric/GSL/Special/Psi.hs
index bee934b..c0021e4 100644
--- a/lib/GSL/Special/Psi.hs
+++ b/lib/Numeric/GSL/Special/Psi.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Psi
+Module      :  Numeric.GSL.Special.Psi
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,7 +14,7 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Psi(
+module Numeric.GSL.Special.Psi(
   psi_int_e
 , psi_int
 , psi_e
@@ -30,7 +30,7 @@ module GSL.Special.Psi(
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_psi_int_e(int n,gsl_sf_result* result);
 --
diff --git a/lib/GSL/Special/Synchrotron.hs b/lib/Numeric/GSL/Special/Synchrotron.hs
index 2ed484b..14881fe 100644
--- a/lib/GSL/Special/Synchrotron.hs
+++ b/lib/Numeric/GSL/Special/Synchrotron.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Synchrotron
+Module      :  Numeric.GSL.Special.Synchrotron
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,7 +14,7 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Synchrotron(
+module Numeric.GSL.Special.Synchrotron(
   synchrotron_1_e
 , synchrotron_1
 , synchrotron_2_e
@@ -22,7 +22,7 @@ module GSL.Special.Synchrotron(
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_synchrotron_1_e(double x,gsl_sf_result* result);
 --
diff --git a/lib/GSL/Special/Trig.hs b/lib/Numeric/GSL/Special/Trig.hs
index 4d37a05..b846c1d 100644
--- a/lib/GSL/Special/Trig.hs
+++ b/lib/Numeric/GSL/Special/Trig.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Trig
+Module      :  Numeric.GSL.Special.Trig
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,11 +14,11 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Trig(
+module Numeric.GSL.Special.Trig(
   sin_e
-, GSL.Special.Trig.sin
+, Numeric.GSL.Special.Trig.sin
 , cos_e
-, GSL.Special.Trig.cos
+, Numeric.GSL.Special.Trig.cos
 , hypot_e
 , hypot
 , sinc_e
@@ -36,7 +36,7 @@ module GSL.Special.Trig(
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_sin_e(double x,gsl_sf_result* result);
 sin_e :: Double -> (Double,Double)
diff --git a/lib/GSL/Special/Zeta.hs b/lib/Numeric/GSL/Special/Zeta.hs
index 01cfdac..48c8ff1 100644
--- a/lib/GSL/Special/Zeta.hs
+++ b/lib/Numeric/GSL/Special/Zeta.hs
@@ -1,6 +1,6 @@
 ------------------------------------------------------------
 {- |
-Module      :  GSL.Special.Zeta
+Module      :  Numeric.GSL.Special.Zeta
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 Maintainer  :  Alberto Ruiz (aruiz at um dot es)
@@ -14,7 +14,7 @@ Wrappers for selected functions described at:
 -}
 ------------------------------------------------------------
 
-module GSL.Special.Zeta(
+module Numeric.GSL.Special.Zeta(
   zeta_int_e
 , zeta_int
 , zeta_e
@@ -32,7 +32,7 @@ module GSL.Special.Zeta(
 ) where
 
 import Foreign(Ptr)
-import GSL.Special.Internal
+import Numeric.GSL.Special.Internal
 
 -- | wrapper for int gsl_sf_zeta_int_e(int n,gsl_sf_result* result);
 --
diff --git a/lib/GSL/Special/airy.h b/lib/Numeric/GSL/Special/airy.h
index e34e012..e34e012 100644
--- a/lib/GSL/Special/airy.h
+++ b/lib/Numeric/GSL/Special/airy.h
diff --git a/lib/GSL/Special/auto.hs b/lib/Numeric/GSL/Special/auto.hs
index 0ef7d0a..d2baff6 100644
--- a/lib/GSL/Special/auto.hs
+++ b/lib/Numeric/GSL/Special/auto.hs
@@ -60,8 +60,8 @@ main = do
     --mapM_ (putStrLn.showFull (name ++".h")) parsed
     let exports = rep (")",") where") $ rep ("(\n","(\n  ") $ rep (",\n",", ") $ unlines $ ["("]++intersperse "," (map (\(Header _ n _) -> hName n) (filter safe parsed))++[")"]
     let defs = unlines $ map (showFull (name ++".h")) parsed
-    let imports = "\nimport Foreign(Ptr)\nimport GSL.Special.Internal\n"
-    let mod = modhead name ++ "module GSL.Special."++ upperFirst name++exports++imports++defs
+    let imports = "\nimport Foreign(Ptr)\nimport Numeric.GSL.Special.Internal\n"
+    let mod = modhead name ++ "module Numeric.GSL.Special."++ upperFirst name++exports++imports++defs
     writeFile (upperFirst name ++ ".hs") mod
 
 
@@ -71,7 +71,7 @@ google name = "<http://www.google.com/search?q="
 
 modhead name = replicate 60 '-' ++ "\n"
              ++"{- |\n"
-             ++"Module      :  GSL.Special."++upperFirst name++"\n"
+             ++"Module      :  Numeric.GSL.Special."++upperFirst name++"\n"
              ++"Copyright   :  (c) Alberto Ruiz 2006\n"
              ++"License     :  GPL-style\n"
              ++"Maintainer  :  Alberto Ruiz (aruiz at um dot es)\n"
diff --git a/lib/GSL/Special/autoall.sh b/lib/Numeric/GSL/Special/autoall.sh
index cb45957..cb45957 100644
--- a/lib/GSL/Special/autoall.sh
+++ b/lib/Numeric/GSL/Special/autoall.sh
diff --git a/lib/GSL/Special/bessel.h b/lib/Numeric/GSL/Special/bessel.h
index 5a2445d..5a2445d 100644
--- a/lib/GSL/Special/bessel.h
+++ b/lib/Numeric/GSL/Special/bessel.h
diff --git a/lib/GSL/Special/clausen.h b/lib/Numeric/GSL/Special/clausen.h
index 9f0225b..9f0225b 100644
--- a/lib/GSL/Special/clausen.h
+++ b/lib/Numeric/GSL/Special/clausen.h
diff --git a/lib/GSL/Special/coulomb.h b/lib/Numeric/GSL/Special/coulomb.h
index 2551081..2551081 100644
--- a/lib/GSL/Special/coulomb.h
+++ b/lib/Numeric/GSL/Special/coulomb.h
diff --git a/lib/GSL/Special/coupling.h b/lib/Numeric/GSL/Special/coupling.h
index 17de964..17de964 100644
--- a/lib/GSL/Special/coupling.h
+++ b/lib/Numeric/GSL/Special/coupling.h
diff --git a/lib/GSL/Special/dawson.h b/lib/Numeric/GSL/Special/dawson.h
index 5f878b5..5f878b5 100644
--- a/lib/GSL/Special/dawson.h
+++ b/lib/Numeric/GSL/Special/dawson.h
diff --git a/lib/GSL/Special/debye.h b/lib/Numeric/GSL/Special/debye.h
index 2424b63..2424b63 100644
--- a/lib/GSL/Special/debye.h
+++ b/lib/Numeric/GSL/Special/debye.h
diff --git a/lib/GSL/Special/dilog.h b/lib/Numeric/GSL/Special/dilog.h
index ce1599e..ce1599e 100644
--- a/lib/GSL/Special/dilog.h
+++ b/lib/Numeric/GSL/Special/dilog.h
diff --git a/lib/GSL/Special/elementary.h b/lib/Numeric/GSL/Special/elementary.h
index bf5adf8..bf5adf8 100644
--- a/lib/GSL/Special/elementary.h
+++ b/lib/Numeric/GSL/Special/elementary.h
diff --git a/lib/GSL/Special/ellint.h b/lib/Numeric/GSL/Special/ellint.h
index 5329c6c..5329c6c 100644
--- a/lib/GSL/Special/ellint.h
+++ b/lib/Numeric/GSL/Special/ellint.h
diff --git a/lib/GSL/Special/erf.h b/lib/Numeric/GSL/Special/erf.h
index 17369cf..17369cf 100644
--- a/lib/GSL/Special/erf.h
+++ b/lib/Numeric/GSL/Special/erf.h
diff --git a/lib/GSL/Special/exp.h b/lib/Numeric/GSL/Special/exp.h
index 20062f0..20062f0 100644
--- a/lib/GSL/Special/exp.h
+++ b/lib/Numeric/GSL/Special/exp.h
diff --git a/lib/GSL/Special/expint.h b/lib/Numeric/GSL/Special/expint.h
index 1dd469f..1dd469f 100644
--- a/lib/GSL/Special/expint.h
+++ b/lib/Numeric/GSL/Special/expint.h
diff --git a/lib/GSL/Special/fermi_dirac.h b/lib/Numeric/GSL/Special/fermi_dirac.h
index 7a4c757..7a4c757 100644
--- a/lib/GSL/Special/fermi_dirac.h
+++ b/lib/Numeric/GSL/Special/fermi_dirac.h
diff --git a/lib/GSL/Special/gamma.h b/lib/Numeric/GSL/Special/gamma.h
index c5cc417..c5cc417 100644
--- a/lib/GSL/Special/gamma.h
+++ b/lib/Numeric/GSL/Special/gamma.h
diff --git a/lib/GSL/Special/gegenbauer.h b/lib/Numeric/GSL/Special/gegenbauer.h
index 228cbd3..228cbd3 100644
--- a/lib/GSL/Special/gegenbauer.h
+++ b/lib/Numeric/GSL/Special/gegenbauer.h
diff --git a/lib/GSL/Special/gsl_sf_exp.h b/lib/Numeric/GSL/Special/gsl_sf_exp.h
index b1f0d89..b1f0d89 100644
--- a/lib/GSL/Special/gsl_sf_exp.h
+++ b/lib/Numeric/GSL/Special/gsl_sf_exp.h
diff --git a/lib/GSL/Special/gsl_sf_log.h b/lib/Numeric/GSL/Special/gsl_sf_log.h
index 5225d05..5225d05 100644
--- a/lib/GSL/Special/gsl_sf_log.h
+++ b/lib/Numeric/GSL/Special/gsl_sf_log.h
diff --git a/lib/GSL/Special/hyperg.h b/lib/Numeric/GSL/Special/hyperg.h
index aa59106..aa59106 100644
--- a/lib/GSL/Special/hyperg.h
+++ b/lib/Numeric/GSL/Special/hyperg.h
diff --git a/lib/GSL/Special/laguerre.h b/lib/Numeric/GSL/Special/laguerre.h
index 6275a05..6275a05 100644
--- a/lib/GSL/Special/laguerre.h
+++ b/lib/Numeric/GSL/Special/laguerre.h
diff --git a/lib/GSL/Special/lambert.h b/lib/Numeric/GSL/Special/lambert.h
index df90d11..df90d11 100644
--- a/lib/GSL/Special/lambert.h
+++ b/lib/Numeric/GSL/Special/lambert.h
diff --git a/lib/GSL/Special/legendre.h b/lib/Numeric/GSL/Special/legendre.h
index aebe84f..aebe84f 100644
--- a/lib/GSL/Special/legendre.h
+++ b/lib/Numeric/GSL/Special/legendre.h
diff --git a/lib/GSL/Special/log.h b/lib/Numeric/GSL/Special/log.h
index 5713845..5713845 100644
--- a/lib/GSL/Special/log.h
+++ b/lib/Numeric/GSL/Special/log.h
diff --git a/lib/GSL/Special/pow_int.h b/lib/Numeric/GSL/Special/pow_int.h
index aba8bc9..aba8bc9 100644
--- a/lib/GSL/Special/pow_int.h
+++ b/lib/Numeric/GSL/Special/pow_int.h
diff --git a/lib/GSL/Special/psi.h b/lib/Numeric/GSL/Special/psi.h
index 589eb34..589eb34 100644
--- a/lib/GSL/Special/psi.h
+++ b/lib/Numeric/GSL/Special/psi.h
diff --git a/lib/GSL/Special/synchrotron.h b/lib/Numeric/GSL/Special/synchrotron.h
index 786401c..786401c 100644
--- a/lib/GSL/Special/synchrotron.h
+++ b/lib/Numeric/GSL/Special/synchrotron.h
diff --git a/lib/GSL/Special/trig.h b/lib/Numeric/GSL/Special/trig.h
index 50677f2..50677f2 100644
--- a/lib/GSL/Special/trig.h
+++ b/lib/Numeric/GSL/Special/trig.h
diff --git a/lib/GSL/Special/zeta.h b/lib/Numeric/GSL/Special/zeta.h
index b961ece..b961ece 100644
--- a/lib/GSL/Special/zeta.h
+++ b/lib/Numeric/GSL/Special/zeta.h
diff --git a/lib/GSL/Vector.hs b/lib/Numeric/GSL/Vector.hs
index b405ff8..ef3d5e8 100644
--- a/lib/GSL/Vector.hs
+++ b/lib/Numeric/GSL/Vector.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 -- |
--- Module      :  GSL.Vector
+-- Module      :  Numeric.GSL.Vector
 -- Copyright   :  (c) Alberto Ruiz 2007
 -- License     :  GPL-style
 --
@@ -12,8 +12,9 @@
 -- Vector operations
 --
 -----------------------------------------------------------------------------
+-- #hide
 
-module GSL.Vector (
+module Numeric.GSL.Vector (
     FunCodeS(..), toScalarR,
     FunCodeV(..), vectorMapR, vectorMapC,
     FunCodeSV(..), vectorMapValR, vectorMapValC,
diff --git a/lib/GSL/gsl-aux.c b/lib/Numeric/GSL/gsl-aux.c
index c602d5e..c602d5e 100644
--- a/lib/GSL/gsl-aux.c
+++ b/lib/Numeric/GSL/gsl-aux.c
diff --git a/lib/GSL/gsl-aux.h b/lib/Numeric/GSL/gsl-aux.h
index 3ccac25..3ccac25 100644
--- a/lib/GSL/gsl-aux.h
+++ b/lib/Numeric/GSL/gsl-aux.h
diff --git a/lib/LinearAlgebra.hs b/lib/Numeric/LinearAlgebra.hs
index d6ef647..f3190a2 100644
--- a/lib/LinearAlgebra.hs
+++ b/lib/Numeric/LinearAlgebra.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 {- |
-Module      :  LinearAlgebra
+Module      :  Numeric.LinearAlgebra
 Copyright   :  (c) Alberto Ruiz 2006-7
 License     :  GPL-style
 
@@ -12,16 +12,16 @@ Basic matrix computations implemented by BLAS, LAPACK and GSL.
 
 -}
 -----------------------------------------------------------------------------
-module LinearAlgebra (
+module Numeric.LinearAlgebra (
     module Data.Packed,
-    module LinearAlgebra.Linear,
-    module LinearAlgebra.Algorithms,
-    module LinearAlgebra.Instances,
-    module LinearAlgebra.Interface
+    module Numeric.LinearAlgebra.Linear,
+    module Numeric.LinearAlgebra.Algorithms,
+    module Numeric.LinearAlgebra.Instances,
+    module Numeric.LinearAlgebra.Interface
 ) where
 
 import Data.Packed
-import LinearAlgebra.Linear
-import LinearAlgebra.Algorithms
-import LinearAlgebra.Instances
-import LinearAlgebra.Interface
+import Numeric.LinearAlgebra.Linear
+import Numeric.LinearAlgebra.Algorithms
+import Numeric.LinearAlgebra.Instances
+import Numeric.LinearAlgebra.Interface
diff --git a/lib/LinearAlgebra/Algorithms.hs b/lib/Numeric/LinearAlgebra/Algorithms.hs
index 682b17f..3513b18 100644
--- a/lib/LinearAlgebra/Algorithms.hs
+++ b/lib/Numeric/LinearAlgebra/Algorithms.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 {- |
-Module      :  LinearAlgebra.Algorithms
+Module      :  Numeric.LinearAlgebra.Algorithms
 Copyright   :  (c) Alberto Ruiz 2006-7
 License     :  GPL-style
 
@@ -18,7 +18,7 @@ imported from the LAPACK and GSL.Matrix modules.
 -}
 -----------------------------------------------------------------------------
 
-module LinearAlgebra.Algorithms (
+module Numeric.LinearAlgebra.Algorithms (
 -- * Linear Systems
     linearSolve,
     inv, pinv,
@@ -30,7 +30,7 @@ module LinearAlgebra.Algorithms (
 -- ** Eigensystems
     eig, eigSH,
 -- ** Other 
-    LinearAlgebra.Algorithms.qr, chol,
+    Numeric.LinearAlgebra.Algorithms.qr, chol,
 -- * Nullspace
     nullspacePrec,
     nullVector,
@@ -44,11 +44,11 @@ module LinearAlgebra.Algorithms (
 
 import Data.Packed.Internal hiding (fromComplex, toComplex, comp, conj)
 import Data.Packed
-import GSL.Matrix(luR,luC,qr)
-import GSL.Vector
-import LinearAlgebra.LAPACK as LAPACK
+import Numeric.GSL.Matrix(luR,luC,qr)
+import Numeric.GSL.Vector
+import Numeric.LinearAlgebra.LAPACK as LAPACK
 import Complex
-import LinearAlgebra.Linear
+import Numeric.LinearAlgebra.Linear
 
 -- | Auxiliary typeclass used to define generic computations for both real and complex matrices.
 class (Linear Matrix t) => GenMat t where
@@ -93,7 +93,7 @@ chol m | m `equal` ctrans m = cholSH m
        | otherwise = error "chol requires positive definite complex hermitian or real symmetric matrix"
 
 qr :: Matrix Double -> (Matrix Double, Matrix Double)
-qr = GSL.Matrix.qr
+qr = Numeric.GSL.Matrix.qr
 
 square m = rows m == cols m
 
diff --git a/lib/LinearAlgebra/Instances.hs b/lib/Numeric/LinearAlgebra/Instances.hs
index 3dbe5a7..388f3da 100644
--- a/lib/LinearAlgebra/Instances.hs
+++ b/lib/Numeric/LinearAlgebra/Instances.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -fglasgow-exts -fallow-undecidable-instances #-}
 -----------------------------------------------------------------------------
 {- |
-Module      :  LinearAlgebra.Instances
+Module      :  Numeric.LinearAlgebra.Instances
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 
@@ -16,11 +16,11 @@ In the context of the standard numeric operators, one-component vectors and matr
 -}
 -----------------------------------------------------------------------------
 
-module LinearAlgebra.Instances(
+module Numeric.LinearAlgebra.Instances(
 ) where
 
-import LinearAlgebra.Linear
-import GSL.Vector
+import Numeric.LinearAlgebra.Linear
+import Numeric.GSL.Vector
 import Data.Packed.Matrix
 import Data.Packed.Vector
 import Complex
diff --git a/lib/LinearAlgebra/Interface.hs b/lib/Numeric/LinearAlgebra/Interface.hs
index 0c65a8b..5bd207a 100644
--- a/lib/LinearAlgebra/Interface.hs
+++ b/lib/Numeric/LinearAlgebra/Interface.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 {- |
-Module      :  LinearAlgebra.Interface
+Module      :  Numeric.LinearAlgebra.Interface
 Copyright   :  (c) Alberto Ruiz 2006
 License     :  GPL-style
 
@@ -14,17 +14,17 @@ Operators for frequent operations.
 -}
 -----------------------------------------------------------------------------
 
-module LinearAlgebra.Interface(
+module Numeric.LinearAlgebra.Interface(
     (<>),(<.>),
     (<\>),
     (.*),(*/),
     (<|>),(<->),
 ) where
 
-import LinearAlgebra.Linear
+import Numeric.LinearAlgebra.Linear
 import Data.Packed.Vector
 import Data.Packed.Matrix
-import LinearAlgebra.Algorithms
+import Numeric.LinearAlgebra.Algorithms
 
 class Mul a b c | a b -> c where
  infixl 7 <>
diff --git a/lib/LinearAlgebra/LAPACK.hs b/lib/Numeric/LinearAlgebra/LAPACK.hs
index c6908e3..648e59f 100644
--- a/lib/LinearAlgebra/LAPACK.hs
+++ b/lib/Numeric/LinearAlgebra/LAPACK.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 -- |
--- Module      :  LinearAlgebra.LAPACK
+-- Module      :  Numeric.LinearAlgebra.LAPACK
 -- Copyright   :  (c) Alberto Ruiz 2006-7
 -- License     :  GPL-style
 -- 
@@ -13,7 +13,7 @@
 --
 -----------------------------------------------------------------------------
 
-module LinearAlgebra.LAPACK (
+module Numeric.LinearAlgebra.LAPACK (
     svdR, svdRdd, svdC,
     eigC, eigR, eigS, eigH, eigS', eigH',
     linearSolveR, linearSolveC,
@@ -28,7 +28,7 @@ import Data.Packed.Internal.Vector
 import Data.Packed.Internal.Matrix
 import Data.Packed.Vector
 import Data.Packed.Matrix
-import GSL.Vector(vectorMapValR, FunCodeSV(Scale))
+import Numeric.GSL.Vector(vectorMapValR, FunCodeSV(Scale))
 import Complex
 import Foreign
 
diff --git a/lib/LinearAlgebra/LAPACK/clapack.h b/lib/Numeric/LinearAlgebra/LAPACK/clapack.h
index cad9a4c..cad9a4c 100644
--- a/lib/LinearAlgebra/LAPACK/clapack.h
+++ b/lib/Numeric/LinearAlgebra/LAPACK/clapack.h
diff --git a/lib/LinearAlgebra/LAPACK/f2c.h b/lib/Numeric/LinearAlgebra/LAPACK/f2c.h
index b94ee7c..b94ee7c 100644
--- a/lib/LinearAlgebra/LAPACK/f2c.h
+++ b/lib/Numeric/LinearAlgebra/LAPACK/f2c.h
diff --git a/lib/LinearAlgebra/LAPACK/lapack-aux.c b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c
index 4ef9a6e..4ef9a6e 100644
--- a/lib/LinearAlgebra/LAPACK/lapack-aux.c
+++ b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c
diff --git a/lib/LinearAlgebra/LAPACK/lapack-aux.h b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h
index ea71847..ea71847 100644
--- a/lib/LinearAlgebra/LAPACK/lapack-aux.h
+++ b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h
diff --git a/lib/LinearAlgebra/Linear.hs b/lib/Numeric/LinearAlgebra/Linear.hs
index 7cd1a52..a3a0183 100644
--- a/lib/LinearAlgebra/Linear.hs
+++ b/lib/Numeric/LinearAlgebra/Linear.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 {- |
-Module      :  LinearAlgebra.Linear
+Module      :  Numeric.LinearAlgebra.Linear
 Copyright   :  (c) Alberto Ruiz 2006-7
 License     :  GPL-style
 
@@ -14,7 +14,7 @@ Basic optimized operations on vectors and matrices.
 -}
 -----------------------------------------------------------------------------
 
-module LinearAlgebra.Linear (
+module Numeric.LinearAlgebra.Linear (
     Linear(..),
     multiply, dot, outer
 ) where
@@ -22,7 +22,7 @@ module LinearAlgebra.Linear (
 
 import Data.Packed.Internal
 import Data.Packed
-import GSL.Vector
+import Numeric.GSL.Vector
 import Complex
 
 -- | basic optimized operations