diff --git a/Codec/Sexpr.hs b/Codec/Sexpr.hs
--- a/Codec/Sexpr.hs
+++ b/Codec/Sexpr.hs
@@ -1,15 +1,15 @@
-module Sexpr (Sexpr,
-              atom,
-              hintedAtom,
-              list,
-              isAtom,
-              isList,
-              hint,
-              defaultHint,
-              unAtom,
-              unList,
-              isTokenChar,isInitialTokenChar,isQuoteableChar
-              ) where
+module Codec.Sexpr (Sexpr,
+                    atom,
+                    hintedAtom,
+                    list,
+                    isAtom,
+                    isList,
+                    hint,
+                    defaultHint,
+                    unAtom,
+                    unList,
+                    isTokenChar,isInitialTokenChar,isQuoteableChar
+                   ) where
 
 import Data.Char
 
diff --git a/Codec/Sexpr/Parser.hs b/Codec/Sexpr/Parser.hs
--- a/Codec/Sexpr/Parser.hs
+++ b/Codec/Sexpr/Parser.hs
@@ -1,8 +1,8 @@
-module Parser (readSexpr,
-               sexpr,
-               canonicalSexpr) where
+module Codec.Sexpr.Parser (readSexpr,
+                           sexpr,
+                           canonicalSexpr) where
 
-import Sexpr
+import Codec.Sexpr
 
 import Data.Char
 import Text.ParserCombinators.ReadP
diff --git a/Codec/Sexpr/Printer.hs b/Codec/Sexpr/Printer.hs
--- a/Codec/Sexpr/Printer.hs
+++ b/Codec/Sexpr/Printer.hs
@@ -1,9 +1,9 @@
-module Printer (canonical, canonicalString,
-                basic, basicString,
-                advanced, advancedString
-               ) where
+module Codec.Sexpr.Printer (canonical, canonicalString,
+                            basic, basicString,
+                            advanced, advancedString
+                           ) where
 
-import Sexpr
+import Codec.Sexpr
 
 import Data.Char
 import Data.Maybe
@@ -20,9 +20,9 @@
 canonical :: Sexpr -> ShowS
 canonical s | isAtom s && hint s == Just defaultHint = raw $ unAtom s
 canonical s | isAtom s = showString "[" 
-                             . raw (fromJust $ hint s)
-                             . showString "]"
-                             . raw (unAtom s)
+                         . raw (fromJust $ hint s)
+                         . showString "]"
+                         . raw (unAtom s)
 canonical s | isList s = showString "("
                  . showString (foldr (.) id (map canonical $ unList s) $ "")
                  . showString ")"
diff --git a/sexpr.cabal b/sexpr.cabal
--- a/sexpr.cabal
+++ b/sexpr.cabal
@@ -1,5 +1,5 @@
 Name:                sexpr
-Version:             0.1
+Version:             0.1.1
 Cabal-Version:	     >= 1.2
 Synopsis:            S-expression printer and parser 
 Description:         Parser and printer for S-expressions, including Ron