diff --git a/Iso.hs b/Data/Iso/Core.hs
similarity index 98%
rename from Iso.hs
rename to Data/Iso/Core.hs
index 802c958..fe202da 100644
--- a/Iso.hs
+++ b/Data/Iso/Core.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TypeOperators #-}
 
-module Iso (
+module Data.Iso.Core (
 
   -- * Partial isomorphisms
   Iso(..), convert, inverse, (<>),
diff --git a/TH.hs b/Data/Iso/TH.hs
similarity index 96%
rename from TH.hs
rename to Data/Iso/TH.hs
index 45a3c0a..a8affbb 100644
--- a/TH.hs
+++ b/Data/Iso/TH.hs
@@ -1,9 +1,9 @@
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE TemplateHaskell #-}
 
-module TH (deriveIsos) where
+module Data.Iso.TH (deriveIsos) where
 
-import Iso
+import Data.Iso.Core
 import Language.Haskell.TH
 import Control.Applicative
 import Control.Monad
diff --git a/Example.hs b/Example.hs
index f12f528..7a51801 100644
--- a/Example.hs
+++ b/Example.hs
@@ -4,9 +4,9 @@
 
 module Example where
 
-import Iso
-import JsonGrammar
-import TH
+import Data.Iso.Core
+import Data.Iso.TH
+import Language.JsonGrammar
 
 import Prelude hiding (id, (.), head)
 import Control.Category
diff --git a/JsonGrammar.cabal b/JsonGrammar.cabal
index 5ee65f1..3896066 100644
--- a/JsonGrammar.cabal
+++ b/JsonGrammar.cabal
@@ -20,9 +20,9 @@ Build-type:     Simple
 
 
 Library
-  Exposed-Modules:  Iso,
-                    JsonGrammar,
-                    TH
+  Exposed-Modules:  Data.Iso.Core,
+                    Data.Iso.TH,
+                    Language.JsonGrammar
   Build-Depends:    base >= 3.0 && < 3.1,
                     containers >= 0.3 && < 0.4,
                     aeson >= 0.3 && < 0.4,
diff --git a/JsonGrammar.hs b/Language/JsonGrammar.hs
similarity index 98%
rename from JsonGrammar.hs
rename to Language/JsonGrammar.hs
index fc1ea28..8fca1d7 100644
--- a/JsonGrammar.hs
+++ b/Language/JsonGrammar.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE OverlappingInstances #-}
 
-module JsonGrammar (
+module Language.JsonGrammar (
   -- * The Json type class
   Json(..), fromJson, toJson,
   
@@ -11,7 +11,7 @@ module JsonGrammar (
   
   ) where
 
-import Iso
+import Data.Iso.Core
 
 import Prelude hiding (id, (.), head, maybe)