diff --git a/Bits.hs b/Data/Binary/Bits.hs
similarity index 85%
rename from Bits.hs
rename to Data/Binary/Bits.hs
index 8b8d49a..fccfdf2 100644
--- a/Bits.hs
+++ b/Data/Binary/Bits.hs
@@ -1,7 +1,7 @@
-module Bits where
+module Data.Binary.Bits where
 
-import BitsGet
-import BitsPut
+import Data.Binary.Bits.Get
+import Data.Binary.Bits.Put
 
 import Data.Word
 
diff --git a/BitsGet.hs b/Data/Binary/Bits/Get.hs
similarity index 99%
rename from BitsGet.hs
rename to Data/Binary/Bits/Get.hs
index 6c585bc..b879c2e 100644
--- a/BitsGet.hs
+++ b/Data/Binary/Bits/Get.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE RankNTypes, MagicHash, CPP #-}
 
-module BitsGet
+module Data.Binary.Bits.Get
             ( T(..)
             , runBitGet
             , runBitGetSimple
diff --git a/BitsPut.hs b/Data/Binary/Bits/Put.hs
similarity index 99%
rename from BitsPut.hs
rename to Data/Binary/Bits/Put.hs
index 89e7a3f..0c46c0c 100644
--- a/BitsPut.hs
+++ b/Data/Binary/Bits/Put.hs
@@ -1,4 +1,4 @@
-module BitsPut
+module Data.Binary.Bits.Put
           ( BitPut
           , runBitPut
           , joinPut
diff --git a/binary-bits.cabal b/binary-bits.cabal
index 08ccb2f..5788f1b 100644
--- a/binary-bits.cabal
+++ b/binary-bits.cabal
@@ -20,9 +20,12 @@ cabal-version:       >=1.10
 
 
 library
-  exposed-modules:     BitsGet, BitsPut, Bits
-
   build-depends: base==4.*, binary, bytestring
+
+  exposed-modules:     Data.Binary.Bits ,
+                       Data.Binary.Bits.Put ,
+                       Data.Binary.Bits.Get
+
   default-language:    Haskell98
 
   -- other-modules: