82 files changed, 412 insertions, 15 deletions

diff --git a/.gitmodules b/.gitmodules
index 1bc7a6d4..e69de29b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +0,0 @@
-[submodule "sub/bencoding"]
-        path = sub/bencoding
-        url = git://github.com/pxqr/bencoding.git
-[submodule "sub/krpc"]
-        path = sub/krpc
-        url = git://github.com/pxqr/krpc.git
-[submodule "sub/optparse-applicative"]
-        path = sub/optparse-applicative
-        url = https://github.com/pcapriotti/optparse-applicative.git
diff --git a/README.md b/bittorrent/README.md
index 32948896..32948896 100644
--- a/README.md
+++ b/bittorrent/README.md
diff --git a/src/Readme.md b/bittorrent/Readme.md
index e092c3ad..e092c3ad 100644
--- a/src/Readme.md
+++ b/bittorrent/Readme.md
diff --git a/bench/Main.hs b/bittorrent/bench/Main.hs
index f04485ab..f04485ab 100644
--- a/bench/Main.hs
+++ b/bittorrent/bench/Main.hs
diff --git a/bench/Throughtput.hs b/bittorrent/bench/Throughtput.hs
index d0404405..d0404405 100644
--- a/bench/Throughtput.hs
+++ b/bittorrent/bench/Throughtput.hs
diff --git a/bench/TorrentFile.hs b/bittorrent/bench/TorrentFile.hs
index e91a9c10..e91a9c10 100644
--- a/bench/TorrentFile.hs
+++ b/bittorrent/bench/TorrentFile.hs
diff --git a/bittorrent/bittorrent.cabal b/bittorrent/bittorrent.cabal
new file mode 100644
index 00000000..910194c2
--- /dev/null
+++ b/bittorrent/bittorrent.cabal
@@ -0,0 +1,412 @@
+name:                  bittorrent
+version:               0.0.0.3
+license:               BSD3
+license-file:          LICENSE
+author:                Sam Truzjan
+maintainer:            Sam Truzjan <pxqr.sta@gmail.com>
+copyright:             (c) 2013, Sam Truzjan
+category:              Network
+build-type:            Simple
+cabal-version:         >= 1.10
+tested-with:           GHC == 7.6.3
+homepage:              https://github.com/cobit/bittorrent
+bug-reports:           https://github.com/cobit/bittorrent/issues
+synopsis:              BitTorrent protocol implementation.
+description:
+
+  A library for making Haskell bittorrent applications easy.
+  .
+  For more information see:
+  <https://github.com/cobit/bittorrent/blob/master/README.md>
+
+extra-source-files:    res/dapper-dvd-amd64.iso.torrent
+                       res/pkg.torrent
+                       README.md
+                       ChangeLog
+                       cbits/*.h
+
+
+source-repository head
+  type:                git
+  location:            git://github.com/cobit/bittorrent.git
+
+source-repository this
+  type:                git
+  location:            git://github.com/cobit/bittorrent.git
+  branch:              master
+  tag:                 v0.0.0.3
+
+flag testing
+  description:         Whether to build tests.
+  default:             False
+
+flag examples
+  description:         Whether to build examples.
+  default:             False
+
+flag network-uri
+  description:         Use network-uri package.
+  default:             True
+
+flag bits-extras
+  description:         Use more-effecient bits-extras bitwise operations.
+  default:             False
+
+flag dht-only
+  description:         Build only DHT related modules.
+  default:             True
+
+flag builder
+  description: Use older bytestring package and bytestring-builder.
+  default: False
+
+flag aeson
+  description: Use aeson for pretty-printing bencoded data.
+  default: True
+
+flag thread-debug
+  description: Add instrumentation to threads.
+  default: True
+
+library
+  default-language:    Haskell2010
+  default-extensions:  PatternGuards
+                     , OverloadedStrings
+                     , RecordWildCards
+  hs-source-dirs:      src, cryptonite-backport, .
+  exposed-modules:  Network.SocketLike
+                    Data.Digest.CRC32C
+                    Data.Bits.ByteString
+                    Data.Wrapper.PSQ
+                    Data.Wrapper.PSQInt
+                    Data.MinMaxPSQ
+                    Network.Address
+                    Network.DHT.Routing
+                    Data.Torrent
+                    Network.BitTorrent.DHT.ContactInfo
+                    Network.BitTorrent.DHT.Token
+                    Network.BitTorrent.DHT.Search
+                    Network.QueryResponse
+                    Network.StreamServer
+                    Data.BEncode.Pretty
+                    Control.Concurrent.Tasks
+                    Network.Kademlia
+                    Network.BitTorrent.MainlineDHT
+                    System.Global6
+                    Network.Tox
+                    Network.Tox.Transport
+                    Network.Tox.Crypto.Transport
+                    Network.Tox.Onion.Handlers
+                    Network.Tox.Onion.Transport
+                    Network.Tox.DHT.Handlers
+                    Network.Tox.DHT.Transport
+                    Network.Tox.Address
+                    Control.TriadCommittee
+                    Crypto.Tox
+                    Text.XXD
+
+  build-depends:      base
+                    , containers
+                    , array
+                    , hashable
+                    , iproute
+                    , stm
+                    , base16-bytestring
+                    , base32-bytestring
+                    , base64-bytestring
+                    , psqueues
+                    , reflection
+                    , deepseq
+                    , text
+                    , filepath
+                    , directory
+                    , bencoding
+                    , contravariant
+
+                    , cryptonite
+                    , memory
+                    , time
+                    , random
+                    , entropy
+                    , cpu
+
+                    , cereal
+                    , http-types
+
+                    , process
+                    , split
+                    , pretty
+                    , convertible
+                    , data-default
+
+                    , bifunctors
+                    , lens
+                    , lifted-async
+                    , lifted-base
+                    , monad-control
+                    , transformers-base
+                    , mtl
+
+  if flag(network-uri)
+      Build-depends:  network      >= 2.6
+                    , network-uri  >= 2.6
+  else
+      Build-depends:  network      >= 2.4 && < 2.6
+
+
+  other-modules:       Paths_bittorrent
+                       Crypto.Cipher.Salsa
+                       Crypto.Cipher.XSalsa
+                       Crypto.ECC.Class
+                       Crypto.ECC.Simple.Prim
+                       Crypto.ECC.Simple.Types
+                       Crypto.Error.Types
+                       Crypto.Internal.ByteArray
+                       Crypto.Internal.Compat
+                       Crypto.Internal.DeepSeq
+                       Crypto.Internal.Imports
+                       Crypto.PubKey.Curve25519
+
+  C-sources:           cbits/cryptonite_xsalsa.c, cbits/cryptonite_salsa.c
+
+  if !flag(dht-only)
+     exposed-modules:  Network.BitTorrent
+                       Network.BitTorrent.Client
+                       Network.BitTorrent.Client.Types
+                       Network.BitTorrent.Client.Handle
+                       Network.BitTorrent.Exchange
+                       Network.BitTorrent.Exchange.Bitfield
+                       Network.BitTorrent.Exchange.Block
+                       Network.BitTorrent.Exchange.Connection
+                       Network.BitTorrent.Exchange.Download
+                       Network.BitTorrent.Exchange.Manager
+                       Network.BitTorrent.Exchange.Message
+                       Network.BitTorrent.Exchange.Session
+                       Network.BitTorrent.Tracker
+                       Network.BitTorrent.Tracker.List
+                       Network.BitTorrent.Tracker.Message
+                       Network.BitTorrent.Tracker.RPC
+                       Network.BitTorrent.Tracker.RPC.HTTP
+                       Network.BitTorrent.Tracker.RPC.UDP
+                       Network.BitTorrent.Tracker.Session
+                       System.Torrent.Storage
+  if !flag(dht-only)
+    if flag(testing)
+      exposed-modules:
+                       Network.BitTorrent.Internal.Cache
+                       Network.BitTorrent.Internal.Progress
+                       Network.BitTorrent.Internal.Types
+                       System.Torrent.FileMap
+                       System.Torrent.Tree
+    else
+      other-modules:
+                       Network.BitTorrent.Internal.Cache
+                       Network.BitTorrent.Internal.Progress
+                       Network.BitTorrent.Internal.Types
+                       System.Torrent.FileMap
+                       System.Torrent.Tree
+  if flag(aeson)
+    build-depends: aeson, aeson-pretty, unordered-containers, vector
+    cpp-options:   -DBENCODE_AESON
+  if flag(thread-debug)
+    exposed-modules: Control.Concurrent.Lifted.Instrument
+                     Control.Concurrent.Async.Lifted.Instrument
+    cpp-options:   -DTHREAD_DEBUG
+
+  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 -fdefer-typed-holes
+  ghc-prof-options:
+
+
+test-suite spec
+  if !flag(testing)
+    buildable:         False
+  default-language:    Haskell2010
+  default-extensions:  OverloadedStrings
+  type:                exitcode-stdio-1.0
+  hs-source-dirs:      tests
+  main-is:             Main.hs
+  other-modules:       Spec
+                       Config
+                       Network.KRPCSpec
+                       Network.KRPC.MethodSpec
+                       Network.DatagramServer.MainlineSpec
+                       Data.TorrentSpec
+                       Network.BitTorrent.Client.HandleSpec
+                       Network.BitTorrent.CoreSpec
+                       Network.BitTorrent.DHTSpec
+                       Network.BitTorrent.DHT.TestData
+                       Network.BitTorrent.DHT.MessageSpec
+                       Network.BitTorrent.DHT.QuerySpec
+                       Network.DHT.RoutingSpec
+                       Network.BitTorrent.DHT.SessionSpec
+                       Network.BitTorrent.DHT.TokenSpec
+                       Network.BitTorrent.Internal.CacheSpec
+                       Network.BitTorrent.Internal.ProgressSpec
+                       Network.BitTorrent.Tracker.TestData
+                       Network.BitTorrent.Tracker.ListSpec
+                       Network.BitTorrent.Tracker.MessageSpec
+                       Network.BitTorrent.Tracker.RPCSpec
+                       Network.BitTorrent.Tracker.RPC.HTTPSpec
+                       Network.BitTorrent.Tracker.RPC.UDPSpec
+                       Network.BitTorrent.Tracker.SessionSpec
+                       Network.BitTorrent.Exchange.BitfieldSpec
+                       Network.BitTorrent.Exchange.ConnectionSpec
+                       Network.BitTorrent.Exchange.DownloadSpec
+                       Network.BitTorrent.Exchange.MessageSpec
+                       Network.BitTorrent.Exchange.SessionSpec
+                       System.Torrent.StorageSpec
+                       System.Torrent.FileMapSpec
+  build-depends:       base == 4.*
+
+                       -- * Concurrency
+                     , async
+
+                       -- * Data
+                     , bytestring
+                     , bytestring-arbitrary
+                     , containers
+                     , convertible
+                     , data-default
+                     , text
+                     , time
+
+                       -- * Serialization
+                     , cereal
+
+                       -- * Monads
+                     , mtl
+                     , resourcet
+                     , conduit
+                     , conduit-extra
+                     , monad-loops
+                     , monad-logger
+
+                       -- * Network
+                     , http-types
+                     , iproute
+
+                       -- * System
+                     , optparse-applicative >= 0.8
+                     , process
+                     , directory
+                     , filepath
+
+                       -- * Testing
+                     , hspec >= 1.8.2
+                     , QuickCheck
+                     , quickcheck-instances
+
+                       -- * Bittorrent
+                     , bittorrent
+                     , temporary
+                     , bencoding         >= 0.4.3
+  if flag(network-uri)
+    Build-depends:     network      >= 2.6
+                     , network-uri  >= 2.6
+  else
+    Build-depends:     network      >= 2.4 && < 2.6
+  ghc-options:         -Wall -fno-warn-orphans
+
+
+--benchmark bench
+--  default-language:    Haskell2010
+--  default-extensions:
+--  type:                exitcode-stdio-1.0
+--  hs-source-dirs:      bench
+--  main-is:             Main.hs
+--  build-depends:       base
+--                     , bytestring
+--                     , cereal
+--                     , network
+--
+--                     , criterion
+--                     , deepseq
+--
+--                     , 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
+  ghc-options:         -O2 -fforce-recomp
+
+executable dht
+  hs-source-dirs:      examples
+  main-is:             dht.hs
+  default-language:    Haskell2010
+  build-depends:       base, haskeline, network, bytestring, transformers
+
+executable dhtd
+  hs-source-dirs:      examples
+  main-is:             dhtd.hs
+  default-language:    Haskell2010
+  build-depends:       base, network, bytestring, hashable, deepseq
+                     , aeson
+                     , pretty
+                     , bittorrent
+                     , unix
+                     , containers
+                     , stm
+                     , cereal
+                     , bencoding
+  if flag(thread-debug)
+    build-depends: time
+    cpp-options:   -DTHREAD_DEBUG
+
+-- Utility to work with torrent files.
+executable mktorrent
+  if !flag(examples)
+    buildable:         False
+  default-language:    Haskell2010
+  hs-source-dirs:      examples
+  main-is:             MkTorrent.hs
+  other-modules:       Paths_bittorrent
+  build-depends:       base == 4.*
+                     , bytestring
+                     , text
+                     , pretty
+
+                     , mtl
+                     , conduit
+                     , lens
+                     , lifted-async
+                     , parallel-io
+
+                     , bittorrent
+
+                     , filepath
+                     , optparse-applicative
+                     , hslogger
+--  if flag(network-uri)
+--    Build-depends:
+                     , network      >= 2.6
+                     , network-uri  >= 2.6
+--  else
+--    Build-depends:     network      >= 2.4 && < 2.6
+  ghc-options:         -Wall -O2 -threaded
+
+-- nonfunctioning example of very basic bittorrent client
+executable client
+  if !flag(examples)
+    buildable:         False
+  default-language:    Haskell2010
+  hs-source-dirs:      examples
+  main-is:             Client.hs
+  build-depends:       base        == 4.*
+                     , bittorrent
+                     , mtl
+                     , pretty
+                     , data-default
+                     , optparse-applicative
diff --git a/dev/README.md b/bittorrent/dev/README.md
index e2cc51a6..e2cc51a6 100644
--- a/dev/README.md
+++ b/bittorrent/dev/README.md
diff --git a/dev/add-sources.sh b/bittorrent/dev/add-sources.sh
index e125cade..e125cade 100755
--- a/dev/add-sources.sh
+++ b/bittorrent/dev/add-sources.sh
diff --git a/dev/bench b/bittorrent/dev/bench
index 5d03db3f..5d03db3f 100755
--- a/dev/bench
+++ b/bittorrent/dev/bench
diff --git a/dev/test b/bittorrent/dev/test
index 2eb85df2..2eb85df2 100755
--- a/dev/test
+++ b/bittorrent/dev/test
diff --git a/dev/update-dependencies.sh b/bittorrent/dev/update-dependencies.sh
index c83694c3..c83694c3 100755
--- a/dev/update-dependencies.sh
+++ b/bittorrent/dev/update-dependencies.sh
diff --git a/examples/Client.hs b/bittorrent/examples/Client.hs
index 26711676..26711676 100644
--- a/examples/Client.hs
+++ b/bittorrent/examples/Client.hs
diff --git a/examples/FS.hs b/bittorrent/examples/FS.hs
index 550d85a7..550d85a7 100644
--- a/examples/FS.hs
+++ b/bittorrent/examples/FS.hs
diff --git a/examples/MkTorrent.hs b/bittorrent/examples/MkTorrent.hs
index 88a84893..88a84893 100644
--- a/examples/MkTorrent.hs
+++ b/bittorrent/examples/MkTorrent.hs
diff --git a/res/dapper-dvd-amd64.iso.torrent b/bittorrent/res/dapper-dvd-amd64.iso.torrent
index 5713344b..5713344b 100644
--- a/res/dapper-dvd-amd64.iso.torrent
+++ b/bittorrent/res/dapper-dvd-amd64.iso.torrent
diff --git a/res/pkg.torrent b/bittorrent/res/pkg.torrent
index be89e9e0..be89e9e0 100644
--- a/res/pkg.torrent
+++ b/bittorrent/res/pkg.torrent
diff --git a/res/testfile b/bittorrent/res/testfile
index 8e984818..8e984818 100644
--- a/res/testfile
+++ b/bittorrent/res/testfile
diff --git a/res/testfile.torrent b/bittorrent/res/testfile.torrent
index 297f56a2..297f56a2 100644
--- a/res/testfile.torrent
+++ b/bittorrent/res/testfile.torrent
diff --git a/src/Network/BitTorrent.hs b/bittorrent/src/Network/BitTorrent.hs
index 91a58887..91a58887 100644
--- a/src/Network/BitTorrent.hs
+++ b/bittorrent/src/Network/BitTorrent.hs
diff --git a/src/Network/BitTorrent/Client.hs b/bittorrent/src/Network/BitTorrent/Client.hs
index c84290dd..c84290dd 100644
--- a/src/Network/BitTorrent/Client.hs
+++ b/bittorrent/src/Network/BitTorrent/Client.hs
diff --git a/src/Network/BitTorrent/Client/Handle.hs b/bittorrent/src/Network/BitTorrent/Client/Handle.hs
index 66baac48..66baac48 100644
--- a/src/Network/BitTorrent/Client/Handle.hs
+++ b/bittorrent/src/Network/BitTorrent/Client/Handle.hs
diff --git a/src/Network/BitTorrent/Client/Types.hs b/bittorrent/src/Network/BitTorrent/Client/Types.hs
index e2ad858f..e2ad858f 100644
--- a/src/Network/BitTorrent/Client/Types.hs
+++ b/bittorrent/src/Network/BitTorrent/Client/Types.hs
diff --git a/src/Network/BitTorrent/Exchange.hs b/bittorrent/src/Network/BitTorrent/Exchange.hs
index 143bf090..143bf090 100644
--- a/src/Network/BitTorrent/Exchange.hs
+++ b/bittorrent/src/Network/BitTorrent/Exchange.hs
diff --git a/src/Network/BitTorrent/Exchange/Bitfield.hs b/bittorrent/src/Network/BitTorrent/Exchange/Bitfield.hs
index 7bae3475..7bae3475 100644
--- a/src/Network/BitTorrent/Exchange/Bitfield.hs
+++ b/bittorrent/src/Network/BitTorrent/Exchange/Bitfield.hs
diff --git a/src/Network/BitTorrent/Exchange/Block.hs b/bittorrent/src/Network/BitTorrent/Exchange/Block.hs
index bc9a3d24..bc9a3d24 100644
--- a/src/Network/BitTorrent/Exchange/Block.hs
+++ b/bittorrent/src/Network/BitTorrent/Exchange/Block.hs
diff --git a/src/Network/BitTorrent/Exchange/Connection.hs b/bittorrent/src/Network/BitTorrent/Exchange/Connection.hs
index 6804d0a2..6804d0a2 100644
--- a/src/Network/BitTorrent/Exchange/Connection.hs
+++ b/bittorrent/src/Network/BitTorrent/Exchange/Connection.hs
diff --git a/src/Network/BitTorrent/Exchange/Download.hs b/bittorrent/src/Network/BitTorrent/Exchange/Download.hs
index 981db2fb..981db2fb 100644
--- a/src/Network/BitTorrent/Exchange/Download.hs
+++ b/bittorrent/src/Network/BitTorrent/Exchange/Download.hs
diff --git a/src/Network/BitTorrent/Exchange/Manager.hs b/bittorrent/src/Network/BitTorrent/Exchange/Manager.hs
index 30a6a607..30a6a607 100644
--- a/src/Network/BitTorrent/Exchange/Manager.hs
+++ b/bittorrent/src/Network/BitTorrent/Exchange/Manager.hs
diff --git a/src/Network/BitTorrent/Exchange/Message.hs b/bittorrent/src/Network/BitTorrent/Exchange/Message.hs
index 2c6770f7..2c6770f7 100644
--- a/src/Network/BitTorrent/Exchange/Message.hs
+++ b/bittorrent/src/Network/BitTorrent/Exchange/Message.hs
diff --git a/src/Network/BitTorrent/Exchange/Session.hs b/bittorrent/src/Network/BitTorrent/Exchange/Session.hs
index 38a3c3a6..38a3c3a6 100644
--- a/src/Network/BitTorrent/Exchange/Session.hs
+++ b/bittorrent/src/Network/BitTorrent/Exchange/Session.hs
diff --git a/src/Network/BitTorrent/Internal/Cache.hs b/bittorrent/src/Network/BitTorrent/Internal/Cache.hs
index 8c74467a..8c74467a 100644
--- a/src/Network/BitTorrent/Internal/Cache.hs
+++ b/bittorrent/src/Network/BitTorrent/Internal/Cache.hs
diff --git a/src/Network/BitTorrent/Internal/Progress.hs b/bittorrent/src/Network/BitTorrent/Internal/Progress.hs
index 6ac889e2..6ac889e2 100644
--- a/src/Network/BitTorrent/Internal/Progress.hs
+++ b/bittorrent/src/Network/BitTorrent/Internal/Progress.hs
diff --git a/src/Network/BitTorrent/Internal/Types.hs b/bittorrent/src/Network/BitTorrent/Internal/Types.hs
index d157db3e..d157db3e 100644
--- a/src/Network/BitTorrent/Internal/Types.hs
+++ b/bittorrent/src/Network/BitTorrent/Internal/Types.hs
diff --git a/src/Network/BitTorrent/Readme.md b/bittorrent/src/Network/BitTorrent/Readme.md
index ebf9545e..ebf9545e 100644
--- a/src/Network/BitTorrent/Readme.md
+++ b/bittorrent/src/Network/BitTorrent/Readme.md
diff --git a/src/Network/BitTorrent/Tracker.hs b/bittorrent/src/Network/BitTorrent/Tracker.hs
index 6db67559..6db67559 100644
--- a/src/Network/BitTorrent/Tracker.hs
+++ b/bittorrent/src/Network/BitTorrent/Tracker.hs
diff --git a/src/Network/BitTorrent/Tracker/List.hs b/bittorrent/src/Network/BitTorrent/Tracker/List.hs
index 0eb11641..0eb11641 100644
--- a/src/Network/BitTorrent/Tracker/List.hs
+++ b/bittorrent/src/Network/BitTorrent/Tracker/List.hs
diff --git a/src/Network/BitTorrent/Tracker/Message.hs b/bittorrent/src/Network/BitTorrent/Tracker/Message.hs
index b9b6a9d3..b9b6a9d3 100644
--- a/src/Network/BitTorrent/Tracker/Message.hs
+++ b/bittorrent/src/Network/BitTorrent/Tracker/Message.hs
diff --git a/src/Network/BitTorrent/Tracker/RPC.hs b/bittorrent/src/Network/BitTorrent/Tracker/RPC.hs
index 45fef05e..45fef05e 100644
--- a/src/Network/BitTorrent/Tracker/RPC.hs
+++ b/bittorrent/src/Network/BitTorrent/Tracker/RPC.hs
diff --git a/src/Network/BitTorrent/Tracker/RPC/HTTP.hs b/bittorrent/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
index 9b6e056a..9b6e056a 100644
--- a/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
+++ b/bittorrent/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
diff --git a/src/Network/BitTorrent/Tracker/RPC/UDP.hs b/bittorrent/src/Network/BitTorrent/Tracker/RPC/UDP.hs
index 31b6b870..31b6b870 100644
--- a/src/Network/BitTorrent/Tracker/RPC/UDP.hs
+++ b/bittorrent/src/Network/BitTorrent/Tracker/RPC/UDP.hs
diff --git a/src/Network/BitTorrent/Tracker/Session.hs b/bittorrent/src/Network/BitTorrent/Tracker/Session.hs
index aa4a832f..aa4a832f 100644
--- a/src/Network/BitTorrent/Tracker/Session.hs
+++ b/bittorrent/src/Network/BitTorrent/Tracker/Session.hs
diff --git a/src/System/Torrent/FileMap.hs b/bittorrent/src/System/Torrent/FileMap.hs
index 6e8d7f5a..6e8d7f5a 100644
--- a/src/System/Torrent/FileMap.hs
+++ b/bittorrent/src/System/Torrent/FileMap.hs
diff --git a/src/System/Torrent/Storage.hs b/bittorrent/src/System/Torrent/Storage.hs
index 1d77e55d..1d77e55d 100644
--- a/src/System/Torrent/Storage.hs
+++ b/bittorrent/src/System/Torrent/Storage.hs
diff --git a/src/System/Torrent/Tree.hs b/bittorrent/src/System/Torrent/Tree.hs
index 41cfb360..41cfb360 100644
--- a/src/System/Torrent/Tree.hs
+++ b/bittorrent/src/System/Torrent/Tree.hs
diff --git a/tests/Config.hs b/bittorrent/tests/Config.hs
index 55e30867..55e30867 100644
--- a/tests/Config.hs
+++ b/bittorrent/tests/Config.hs
diff --git a/tests/Data/TorrentSpec.hs b/bittorrent/tests/Data/TorrentSpec.hs
index b4a280e4..b4a280e4 100644
--- a/tests/Data/TorrentSpec.hs
+++ b/bittorrent/tests/Data/TorrentSpec.hs
diff --git a/tests/Main.hs b/bittorrent/tests/Main.hs
index 5ed953da..5ed953da 100644
--- a/tests/Main.hs
+++ b/bittorrent/tests/Main.hs
diff --git a/tests/Network/BitTorrent/Client/HandleSpec.hs b/bittorrent/tests/Network/BitTorrent/Client/HandleSpec.hs
index d51bab02..d51bab02 100644
--- a/tests/Network/BitTorrent/Client/HandleSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/Client/HandleSpec.hs
diff --git a/tests/Network/BitTorrent/CoreSpec.hs b/bittorrent/tests/Network/BitTorrent/CoreSpec.hs
index 5bf900b2..5bf900b2 100644
--- a/tests/Network/BitTorrent/CoreSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/CoreSpec.hs
diff --git a/tests/Network/BitTorrent/DHT/MessageSpec.hs b/bittorrent/tests/Network/BitTorrent/DHT/MessageSpec.hs
index 6f3c7489..6f3c7489 100644
--- a/tests/Network/BitTorrent/DHT/MessageSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/DHT/MessageSpec.hs
diff --git a/tests/Network/BitTorrent/DHT/QuerySpec.hs b/bittorrent/tests/Network/BitTorrent/DHT/QuerySpec.hs
index 93f78263..93f78263 100644
--- a/tests/Network/BitTorrent/DHT/QuerySpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/DHT/QuerySpec.hs
diff --git a/tests/Network/BitTorrent/DHT/RoutingSpec.hs b/bittorrent/tests/Network/BitTorrent/DHT/RoutingSpec.hs
index 07a906ba..07a906ba 100644
--- a/tests/Network/BitTorrent/DHT/RoutingSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/DHT/RoutingSpec.hs
diff --git a/tests/Network/BitTorrent/DHT/SessionSpec.hs b/bittorrent/tests/Network/BitTorrent/DHT/SessionSpec.hs
index 32e4c158..32e4c158 100644
--- a/tests/Network/BitTorrent/DHT/SessionSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/DHT/SessionSpec.hs
diff --git a/tests/Network/BitTorrent/DHT/TestData.hs b/bittorrent/tests/Network/BitTorrent/DHT/TestData.hs
index e9473cbb..e9473cbb 100644
--- a/tests/Network/BitTorrent/DHT/TestData.hs
+++ b/bittorrent/tests/Network/BitTorrent/DHT/TestData.hs
diff --git a/tests/Network/BitTorrent/DHT/TokenSpec.hs b/bittorrent/tests/Network/BitTorrent/DHT/TokenSpec.hs
index a45d2212..a45d2212 100644
--- a/tests/Network/BitTorrent/DHT/TokenSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/DHT/TokenSpec.hs
diff --git a/tests/Network/BitTorrent/DHTSpec.hs b/bittorrent/tests/Network/BitTorrent/DHTSpec.hs
index 77160eb5..77160eb5 100644
--- a/tests/Network/BitTorrent/DHTSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/DHTSpec.hs
diff --git a/tests/Network/BitTorrent/Exchange/BitfieldSpec.hs b/bittorrent/tests/Network/BitTorrent/Exchange/BitfieldSpec.hs
index 1ba772f6..1ba772f6 100644
--- a/tests/Network/BitTorrent/Exchange/BitfieldSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/Exchange/BitfieldSpec.hs
diff --git a/tests/Network/BitTorrent/Exchange/BlockSpec.hs b/bittorrent/tests/Network/BitTorrent/Exchange/BlockSpec.hs
index 2dc8e0b8..2dc8e0b8 100644
--- a/tests/Network/BitTorrent/Exchange/BlockSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/Exchange/BlockSpec.hs
diff --git a/tests/Network/BitTorrent/Exchange/ConnectionSpec.hs b/bittorrent/tests/Network/BitTorrent/Exchange/ConnectionSpec.hs
index d654cda1..d654cda1 100644
--- a/tests/Network/BitTorrent/Exchange/ConnectionSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/Exchange/ConnectionSpec.hs
diff --git a/tests/Network/BitTorrent/Exchange/DownloadSpec.hs b/bittorrent/tests/Network/BitTorrent/Exchange/DownloadSpec.hs
index d46f2034..d46f2034 100644
--- a/tests/Network/BitTorrent/Exchange/DownloadSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/Exchange/DownloadSpec.hs
diff --git a/tests/Network/BitTorrent/Exchange/MessageSpec.hs b/bittorrent/tests/Network/BitTorrent/Exchange/MessageSpec.hs
index d615b1ff..d615b1ff 100644
--- a/tests/Network/BitTorrent/Exchange/MessageSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/Exchange/MessageSpec.hs
diff --git a/tests/Network/BitTorrent/Exchange/SessionSpec.hs b/bittorrent/tests/Network/BitTorrent/Exchange/SessionSpec.hs
index bf5b95a1..bf5b95a1 100644
--- a/tests/Network/BitTorrent/Exchange/SessionSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/Exchange/SessionSpec.hs
diff --git a/tests/Network/BitTorrent/Internal/CacheSpec.hs b/bittorrent/tests/Network/BitTorrent/Internal/CacheSpec.hs
index 337e7add..337e7add 100644
--- a/tests/Network/BitTorrent/Internal/CacheSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/Internal/CacheSpec.hs
diff --git a/tests/Network/BitTorrent/Internal/ProgressSpec.hs b/bittorrent/tests/Network/BitTorrent/Internal/ProgressSpec.hs
index acbfd84c..acbfd84c 100644
--- a/tests/Network/BitTorrent/Internal/ProgressSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/Internal/ProgressSpec.hs
diff --git a/tests/Network/BitTorrent/Tracker/ListSpec.hs b/bittorrent/tests/Network/BitTorrent/Tracker/ListSpec.hs
index bba9d0e2..bba9d0e2 100644
--- a/tests/Network/BitTorrent/Tracker/ListSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/Tracker/ListSpec.hs
diff --git a/tests/Network/BitTorrent/Tracker/MessageSpec.hs b/bittorrent/tests/Network/BitTorrent/Tracker/MessageSpec.hs
index 29854d58..29854d58 100644
--- a/tests/Network/BitTorrent/Tracker/MessageSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/Tracker/MessageSpec.hs
diff --git a/tests/Network/BitTorrent/Tracker/RPC/HTTPSpec.hs b/bittorrent/tests/Network/BitTorrent/Tracker/RPC/HTTPSpec.hs
index e928f917..e928f917 100644
--- a/tests/Network/BitTorrent/Tracker/RPC/HTTPSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/Tracker/RPC/HTTPSpec.hs
diff --git a/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs b/bittorrent/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs
index 73acb3fa..73acb3fa 100644
--- a/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs
diff --git a/tests/Network/BitTorrent/Tracker/RPCSpec.hs b/bittorrent/tests/Network/BitTorrent/Tracker/RPCSpec.hs
index dfc13a1e..dfc13a1e 100644
--- a/tests/Network/BitTorrent/Tracker/RPCSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/Tracker/RPCSpec.hs
diff --git a/tests/Network/BitTorrent/Tracker/SessionSpec.hs b/bittorrent/tests/Network/BitTorrent/Tracker/SessionSpec.hs
index 72936ee7..72936ee7 100644
--- a/tests/Network/BitTorrent/Tracker/SessionSpec.hs
+++ b/bittorrent/tests/Network/BitTorrent/Tracker/SessionSpec.hs
diff --git a/tests/Network/BitTorrent/Tracker/TestData.hs b/bittorrent/tests/Network/BitTorrent/Tracker/TestData.hs
index b95e2df4..b95e2df4 100644
--- a/tests/Network/BitTorrent/Tracker/TestData.hs
+++ b/bittorrent/tests/Network/BitTorrent/Tracker/TestData.hs
diff --git a/tests/Network/KRPC/MessageSpec.hs b/bittorrent/tests/Network/KRPC/MessageSpec.hs
index 498ef679..498ef679 100644
--- a/tests/Network/KRPC/MessageSpec.hs
+++ b/bittorrent/tests/Network/KRPC/MessageSpec.hs
diff --git a/tests/Network/KRPC/MethodSpec.hs b/bittorrent/tests/Network/KRPC/MethodSpec.hs
index c1c58282..c1c58282 100644
--- a/tests/Network/KRPC/MethodSpec.hs
+++ b/bittorrent/tests/Network/KRPC/MethodSpec.hs
diff --git a/tests/Network/KRPCSpec.hs b/bittorrent/tests/Network/KRPCSpec.hs
index eabcc817..eabcc817 100644
--- a/tests/Network/KRPCSpec.hs
+++ b/bittorrent/tests/Network/KRPCSpec.hs
diff --git a/tests/Readme.md b/bittorrent/tests/Readme.md
index 7a9d8914..7a9d8914 100644
--- a/tests/Readme.md
+++ b/bittorrent/tests/Readme.md
diff --git a/tests/Spec.hs b/bittorrent/tests/Spec.hs
index b4e92e75..b4e92e75 100644
--- a/tests/Spec.hs
+++ b/bittorrent/tests/Spec.hs
diff --git a/tests/System/Torrent/FileMapSpec.hs b/bittorrent/tests/System/Torrent/FileMapSpec.hs
index 29252925..29252925 100644
--- a/tests/System/Torrent/FileMapSpec.hs
+++ b/bittorrent/tests/System/Torrent/FileMapSpec.hs
diff --git a/tests/System/Torrent/StorageSpec.hs b/bittorrent/tests/System/Torrent/StorageSpec.hs
index b5e49078..b5e49078 100644
--- a/tests/System/Torrent/StorageSpec.hs
+++ b/bittorrent/tests/System/Torrent/StorageSpec.hs
diff --git a/sub/bencoding b/sub/bencoding
deleted file mode 160000
-Subproject dafb6cf53cb919c0c45ff445f5f89129ddaa459
diff --git a/sub/krpc b/sub/krpc
deleted file mode 160000
-Subproject 827a57f66a2ea0087d5eae9de75abae27edbce2
diff --git a/sub/optparse-applicative b/sub/optparse-applicative
deleted file mode 160000
-Subproject af598b6821702ef97f22d9daf0042b1d2c0345a