4 files changed, 9 insertions, 6 deletions

diff --git a/network-bittorrent.cabal b/network-bittorrent.cabal
index 50ff549f..903c7ae7 100644
--- a/network-bittorrent.cabal
+++ b/network-bittorrent.cabal
@@ -19,11 +19,13 @@ source-repository head
 library
   exposed-modules:     Data.Torrent
                      , Network.Torrent
+                     , Network.Torrent.PeerID
                      , Network.Torrent.Tracker
                      , Network.Torrent.Tracker.Scrape
                      , Network.Torrent.PeerWire
-                     , Network.Torrent.PeerID
-                     , Network.Torrent.Handshake
+                     , Network.Torrent.PeerWire.Handshake
+
+
   other-modules:
 
 
diff --git a/src/Network/Torrent.hs b/src/Network/Torrent.hs
index a9194d3e..a37bee41 100644
--- a/src/Network/Torrent.hs
+++ b/src/Network/Torrent.hs
@@ -2,10 +2,8 @@ module Network.Torrent
        ( module Network.Torrent.PeerID
        , module Network.Torrent.Tracker
        , module Network.Torrent.PeerWire
-       , module Network.Torrent.Handshake
        ) where
 
 import Network.Torrent.PeerID
 import Network.Torrent.Tracker
 import Network.Torrent.PeerWire
-import Network.Torrent.Handshake
diff --git a/src/Network/Torrent/PeerWire.hs b/src/Network/Torrent/PeerWire.hs
index b1fae9f2..27ecda79 100644
--- a/src/Network/Torrent/PeerWire.hs
+++ b/src/Network/Torrent/PeerWire.hs
@@ -1,8 +1,11 @@
 {-# LANGUAGE DoAndIfThenElse #-}
 module Network.Torrent.PeerWire
-       ( Message(..), Block(..), BlockIx(..),
+       ( module Network.Torrent.PeerWire.Handshake
+       , Message(..), Block(..), BlockIx(..),
        ) where
 
+import Network.Torrent.PeerWire.Handshake
+
 import Control.Applicative
 import           Data.ByteString (ByteString)
 import qualified Data.ByteString as B
diff --git a/src/Network/Torrent/Handshake.hs b/src/Network/Torrent/PeerWire/Handshake.hs
index c14fd591..7bdb7fef 100644
--- a/src/Network/Torrent/Handshake.hs
+++ b/src/Network/Torrent/PeerWire/Handshake.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE OverloadedStrings #-}
-module Network.Torrent.Handshake
+module Network.Torrent.PeerWire.Handshake
        ( Handshake
        , defaultProtocol, defaultReserved, defaultHandshake
        ) where