2 files changed, 40 insertions, 114 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index ff3ee02b..b82599b8 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -54,13 +54,26 @@ flag dht-only
   description:         Build only DHT related modules.
   default:             False
 
+flag builder
+  description: Use older bytestring package and bytestring-builder.
+  default: False
+
+flag aeson
+  description: Use aeson for pretty-printing bencoded data.
+  default: True
+
 library
   default-language:    Haskell2010
   default-extensions:  PatternGuards
                      , OverloadedStrings
                      , RecordWildCards
   hs-source-dirs:      src
-  exposed-modules:     Data.Torrent
+  exposed-modules:     Network.KRPC
+                       Network.KRPC.Message
+                       Network.KRPC.Method
+                       Network.KRPC.Manager
+                       Data.BEncode.Pretty
+                       Data.Torrent
                        Data.Digest.CRC32C
                        Network.BitTorrent.Address
                        Network.BitTorrent.DHT
@@ -119,6 +132,7 @@ library
                      , mtl
                      , monad-control
                      , transformers-base
+                     , transformers  >= 0.2
 
                        -- Concurrency
                      , SafeSemaphore
@@ -137,10 +151,10 @@ library
                      , monad-logger >= 0.3.4
 
                        -- Data & Data structures
-                     , bytestring   >= 0.10
                      , array
                      , containers   >= 0.5
                      , data-default >= 0.5.2
+                     , data-default-class
 --                     , data-dword
                      , intset       >= 0.1
                      , PSQueue      >= 1.1
@@ -166,7 +180,6 @@ library
                      , time         >= 1.0
 
                        -- Network
-                     , krpc         >= 0.6.1
                      , http-types   >= 0.8
                      , http-client  >= 0.2
                      , http-conduit >= 2.0
@@ -191,7 +204,15 @@ library
                      , bits-extras  >= 0.1.2
   else
     build-depends:     base       >= 4.8
-
+  if flag(aeson)
+    build-depends: aeson, aeson-pretty, unordered-containers, vector
+    cpp-options:   -DBENCODE_AESON
+  if flag(builder)
+    build-depends: bytestring >= 0.9, bytestring-builder
+  else
+    build-depends: bytestring >= 0.10
+  if impl(ghc < 7.6)
+    build-depends:     ghc-prim
   ghc-options:         -Wall
   ghc-prof-options:
 
@@ -206,7 +227,9 @@ test-suite spec
   main-is:             Main.hs
   other-modules:       Spec
                        Config
-
+                       Network.KRPCSpec
+                       Network.KRPC.MethodSpec
+                       Network.KRPC.MessageSpec
                        Data.TorrentSpec
                        Network.BitTorrent.Client.HandleSpec
                        Network.BitTorrent.CoreSpec
@@ -302,6 +325,18 @@ test-suite spec
 --
 --                     , bittorrent
 --  ghc-options:         -O2 -Wall -fno-warn-orphans
+benchmark bench
+  type:                exitcode-stdio-1.0
+  default-language:    Haskell2010
+  hs-source-dirs:      bench
+  main-is:             Main.hs
+  build-depends:       base == 4.*
+                     , bytestring
+                     , mtl
+                     , monad-logger
+                     , criterion
+                     , krpc
+  ghc-options:         -O2 -fforce-recomp
 
 -- Utility to work with torrent files.
 executable mktorrent
diff --git a/krpc.cabal b/krpc.cabal
deleted file mode 100644
index 452f1132..00000000
--- a/krpc.cabal
+++ /dev/null
@@ -1,109 +0,0 @@
-name:                  krpc
-version:               0.6.1.0
-license:               BSD3
-license-file:          LICENSE
-author:                Sam Truzjan
-maintainer:            Sam Truzjan <pxqr.sta@gmail.com>
-copyright:             (c) 2013-2014 Sam Truzjan
-category:              Network
-build-type:            Simple
-cabal-version:         >= 1.10
-tested-with:           GHC == 7.4.1
-                     , GHC == 7.6.3
-homepage:              https://github.com/cobit/krpc
-bug-reports:           https://github.com/cobit/krpc/issues
-synopsis:              KRPC protocol implementation
-description:
-
-  The KRPC protocol is a simple RPC mechanism consisting of bencoded
-  dictionaries sent over UDP.
-  .
-  <http://bittorrent.org/beps/bep_0005.html#krpc-protocol>
-
-extra-source-files:    README.md
-                     , ChangeLog
-
-source-repository head
-  type:                git
-  location:            git://github.com/cobit/krpc.git
-  branch:              master
-
-source-repository this
-  type:                git
-  location:            git://github.com/cobit/krpc.git
-  branch:              master
-  tag:                 v0.6.1.0
-
-flag builder
-  description: Use older bytestring package and bytestring-builder.
-  default: False
-
-flag aeson
-  description: Use aeson for pretty-printing bencoded data.
-  default: True
-
-library
-  default-language:    Haskell2010
-  default-extensions:  PatternGuards
-                     , RecordWildCards
-  hs-source-dirs:      src
-  exposed-modules:     Network.KRPC
-                       Network.KRPC.Message
-                       Network.KRPC.Method
-                       Network.KRPC.Manager
-                       Data.BEncode.Pretty
-  build-depends:       base          == 4.*
-                     , text          >= 0.11
-                     , data-default-class
-                     , lifted-base   >= 0.1.1
-                     , transformers  >= 0.2
-                     , mtl
-                     , monad-control >= 0.3
-                     , monad-logger  >= 0.3
-                     , bencoding     >= 0.4.3
-                     , network       >= 2.3
-                     , cereal
-                     , containers
-  if flag(aeson)
-    build-depends: aeson, aeson-pretty, unordered-containers, vector
-    ghc-options:   -DBENCODE_AESON
-  if flag(builder)
-    build-depends: bytestring >= 0.9, bytestring-builder
-  else
-    build-depends: bytestring >= 0.10
-
-  if impl(ghc < 7.6)
-    build-depends:     ghc-prim
-  ghc-options:         -Wall
-
-test-suite spec
-  type:                exitcode-stdio-1.0
-  default-language:    Haskell2010
-  hs-source-dirs:      tests
-  main-is:             Spec.hs
-  other-modules:       Network.KRPCSpec
-                       Network.KRPC.MethodSpec
-                       Network.KRPC.MessageSpec
-  build-depends:       base        == 4.*
-                     , bytestring
-                     , network
-                     , mtl
-                     , monad-logger
-                     , hspec
-                     , QuickCheck
-                     , quickcheck-instances
-                     , bencoding
-                     , krpc
-
-benchmark bench
-  type:                exitcode-stdio-1.0
-  default-language:    Haskell2010
-  hs-source-dirs:      bench
-  main-is:             Main.hs
-  build-depends:       base == 4.*
-                     , bytestring
-                     , mtl
-                     , monad-logger
-                     , criterion
-                     , krpc
-  ghc-options:         -O2 -fforce-recomp