diff --git a/Help/Collection/collection.help.lhs b/Help/Collection/collection.help.lhs
--- a/Help/Collection/collection.help.lhs
+++ b/Help/Collection/collection.help.lhs
@@ -1,7 +1,5 @@
 * Lists of numbers are numerical, Extension
 
-> import Sound.SC3.Lang.Collection
-
 Pointwise operations in the supercollider 
 language extend the shorter input by
 cycling.
@@ -22,6 +20,8 @@
 numerical type classes with the same 
 extension behaviour, so that:
 
+> import Sound.SC3.Lang.Collection.Numerical
+
 > [1, 2] + [3, 4, 5]
 
 has the same value as in the supercollider
@@ -33,6 +33,8 @@
 
 The function underlying the list numerical 
 instances is zipWith_c:
+
+> import Sound.SC3.Lang.Collection.SequenceableCollection
 
 > zipWith_c (+) [1, 2] [3, 4, 5]
 
diff --git a/Help/Math/pitch.help.lhs b/Help/Math/pitch.help.lhs
--- a/Help/Math/pitch.help.lhs
+++ b/Help/Math/pitch.help.lhs
@@ -1,6 +1,6 @@
 * Pitch & record
 
-> import Sound.SC3.Lang.Math
+> import Sound.SC3.Lang.Math.Pitch
 
 The supercollider language pitch model
 is organised as a tree with three separate
diff --git a/Help/Pattern/List/pcollect.help.lhs b/Help/Pattern/List/pcollect.help.lhs
--- a/Help/Pattern/List/pcollect.help.lhs
+++ b/Help/Pattern/List/pcollect.help.lhs
@@ -6,3 +6,5 @@
 > import Sound.SC3.Lang.Pattern.List
 
 > pcollect (* 3) (pseq [1, 2, 3] 3)
+
+> fmap (* 3) (pseq [1, 2, 3] 3)
diff --git a/README b/README
--- a/README
+++ b/README
@@ -8,5 +8,5 @@
   http://haskell.org/
   http://audiosynth.com/
 
-(c) rohan drape, 2007-2010
+(c) rohan drape, 2007-2011
     gpl, http://gnu.org/copyleft/
diff --git a/Setup.hs b/Setup.hs
new file mode 100644
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,3 @@
+#!/usr/bin/env runhaskell
+import Distribution.Simple
+main = defaultMain
diff --git a/Setup.lhs b/Setup.lhs
deleted file mode 100644
--- a/Setup.lhs
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env runhaskell
-> import Distribution.Simple
-> main = defaultMain
diff --git a/Sound/SC3/Lang.hs b/Sound/SC3/Lang.hs
deleted file mode 100644
--- a/Sound/SC3/Lang.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Sound.SC3.Lang 
-    ( module Sound.SC3.Lang.Collection
-    , module Sound.SC3.Lang.Math ) where
-
-import Sound.SC3.Lang.Collection
-import Sound.SC3.Lang.Math
diff --git a/Sound/SC3/Lang/Collection.hs b/Sound/SC3/Lang/Collection.hs
deleted file mode 100644
--- a/Sound/SC3/Lang/Collection.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-module Sound.SC3.Lang.Collection 
-    ( module Sound.SC3.Lang.Collection.Collection
-    , module Sound.SC3.Lang.Collection.Numerical
-    , module Sound.SC3.Lang.Collection.SequenceableCollection ) where
-
-import Sound.SC3.Lang.Collection.Collection
-import Sound.SC3.Lang.Collection.Numerical
-import Sound.SC3.Lang.Collection.SequenceableCollection
diff --git a/Sound/SC3/Lang/Collection/SequenceableCollection.hs b/Sound/SC3/Lang/Collection/SequenceableCollection.hs
--- a/Sound/SC3/Lang/Collection/SequenceableCollection.hs
+++ b/Sound/SC3/Lang/Collection/SequenceableCollection.hs
@@ -3,7 +3,6 @@
 import Control.Monad
 import Data.List
 import Data.List.Split
-import Data.Maybe
 import Sound.SC3.Lang.Collection.Collection
 import System.Random
 
diff --git a/Sound/SC3/Lang/Math.hs b/Sound/SC3/Lang/Math.hs
deleted file mode 100644
--- a/Sound/SC3/Lang/Math.hs
+++ /dev/null
@@ -1,3 +0,0 @@
-module Sound.SC3.Lang.Math ( module Sound.SC3.Lang.Math.Pitch ) where
-
-import Sound.SC3.Lang.Math.Pitch
diff --git a/hsc3-lang.cabal b/hsc3-lang.cabal
--- a/hsc3-lang.cabal
+++ b/hsc3-lang.cabal
@@ -1,16 +1,16 @@
 Name:              hsc3-lang
-Version:           0.8
+Version:           0.9
 Synopsis:          Haskell SuperCollider Language
 Description:       Haskell library defining operations from the
                    SuperCollider language class library
 License:           GPL
 Category:          Sound
-Copyright:         (c) Rohan Drape, 2007-2010
+Copyright:         (c) Rohan Drape, 2007-2011
 Author:            Rohan Drape
 Maintainer:        rd@slavepianos.org
 Stability:         Experimental
 Homepage:          http://slavepianos.org/rd/?t=hsc3-lang
-Tested-With:       GHC == 6.10.3
+Tested-With:       GHC == 6.12.1
 Build-Type:        Simple
 Cabal-Version:     >= 1.6
 
@@ -27,16 +27,13 @@
                    split,
                    random
   GHC-Options:     -Wall -fwarn-tabs
-  Exposed-modules: Sound.SC3.Lang
-                   Sound.SC3.Lang.Collection
-                   Sound.SC3.Lang.Collection.Collection
+  Exposed-modules: Sound.SC3.Lang.Collection.Collection
                    Sound.SC3.Lang.Collection.Numerical
                    Sound.SC3.Lang.Collection.SequenceableCollection
-                   Sound.SC3.Lang.Math
                    Sound.SC3.Lang.Math.Pitch
                    Sound.SC3.Lang.Pattern.List
                    Sound.SC3.Lang.Pattern.Step
 
 Source-Repository  head
   Type:            darcs
-  Location:        http://slavepianos.org/~rd/sw/hsc3-lang/
+  Location:        http://slavepianos.org/rd/sw/hsc3-lang/