diff --git a/Examples/AddMult.hs b/Examples/AddMult.hs
--- a/Examples/AddMult.hs
+++ b/Examples/AddMult.hs
@@ -7,8 +7,7 @@
 module AddMult ( addMult ) where
 
 import Prelude ()
-import Copilot.Language
-import Copilot.Language.Prelude
+import Language.Copilot
 
 --------------------------------------------------------------------------------
 
diff --git a/Examples/Examples2.hs b/Examples/Examples2.hs
--- a/Examples/Examples2.hs
+++ b/Examples/Examples2.hs
@@ -1,14 +1,11 @@
 module Examples2 ( examples2 ) where
 
 import Prelude ()
-
-import Copilot.Language.Prelude
-import Copilot.Language
-import Copilot.Language.Reify (reify)
+import Language.Copilot
 
 import qualified Copilot.Compile.SBV as S
 
-import Data.List (cycle)
+import qualified Data.List as L
 
 --------------------------------------------------------------------------------
 
@@ -43,7 +40,7 @@
 sumExterns =
   let
     e1 = extern "e1" (Just [0..])
-    e2 = extern "e2" (Just $ cycle [2,3,4])
+    e2 = extern "e2" (Just $ L.cycle [2,3,4])
   in
     e1 + e2 + e1
 
diff --git a/Examples/LTLExamples.hs b/Examples/LTLExamples.hs
--- a/Examples/LTLExamples.hs
+++ b/Examples/LTLExamples.hs
@@ -1,9 +1,7 @@
 module LTLExamples where
 
 import qualified Prelude as P
-import Copilot.Language
-import Copilot.Language.Prelude
-import Copilot.Library.LTL
+import Language.Copilot
 
 ----------------
 -- LTL tests ---
diff --git a/Examples/Local.hs b/Examples/Local.hs
--- a/Examples/Local.hs
+++ b/Examples/Local.hs
@@ -7,8 +7,7 @@
 module Local ( localEx ) where
 
 import Prelude ()
-import Copilot.Language
-import Copilot.Language.Prelude
+import Language.Copilot
 
 --------------------------------------------------------------------------------
 
diff --git a/Examples/PTLTLExamples.hs b/Examples/PTLTLExamples.hs
--- a/Examples/PTLTLExamples.hs
+++ b/Examples/PTLTLExamples.hs
@@ -2,9 +2,7 @@
 
 module PTLTLExamples ( ptltlExamples ) where 
 
-import Copilot.Language
-import Copilot.Language.Prelude
-import Copilot.Library.PTLTL
+import Language.Copilot
 import Prelude ()
 import qualified Data.List as L
 
diff --git a/Examples/RegExpExamples.hs b/Examples/RegExpExamples.hs
--- a/Examples/RegExpExamples.hs
+++ b/Examples/RegExpExamples.hs
@@ -4,10 +4,7 @@
 module RegExpExamples ( regExpExamples ) where
 
 import qualified Prelude as P
-import Copilot.Language
-import Copilot.Language.Prelude
-import Copilot.Library.RegExp
-import Copilot.Library.Utils
+import Language.Copilot
 
 reset :: Stream Bool
 reset = [ False ] ++ cycle [ False, False, False, True ]
diff --git a/Examples/StackExamples.hs b/Examples/StackExamples.hs
--- a/Examples/StackExamples.hs
+++ b/Examples/StackExamples.hs
@@ -2,13 +2,8 @@
 
 module StackExamples ( stackExamples ) where
 
-
-import Prelude ()
 import qualified Prelude as P
-import Copilot.Language
-import Copilot.Library.Stacks
-import Copilot.Language.Prelude
-
+import Language.Copilot
 
 -- push a counter from 1 to 5 onto the stack
 pushSignal :: Stream Bool
diff --git a/Examples/StatExamples.hs b/Examples/StatExamples.hs
--- a/Examples/StatExamples.hs
+++ b/Examples/StatExamples.hs
@@ -3,10 +3,7 @@
 -- | Statistics examples
 
 import Prelude ()
-import Copilot.Language
-import Copilot.Language.Prelude
-import Copilot.Library.Statistics
-
+import Language.Copilot
 
 inputData :: Stream Word16
 inputData = replicate 5 0 ++ inputData + 5
diff --git a/Examples/VotingExamples.hs b/Examples/VotingExamples.hs
--- a/Examples/VotingExamples.hs
+++ b/Examples/VotingExamples.hs
@@ -8,9 +8,7 @@
 
 module VotingExamples ( votingExamples ) where
 
-import Copilot.Library.Voting
-import Copilot.Language
-import Copilot.Language.Prelude
+import Language.Copilot
 
 --------------------------------------------------------------------------------
 
diff --git a/copilot.cabal b/copilot.cabal
--- a/copilot.cabal
+++ b/copilot.cabal
@@ -1,5 +1,5 @@
 name:                copilot
-version:             2.0.3
+version:             2.0.4
 cabal-version:       >= 1.10
 license:             BSD3
 license-file:        LICENSE