Factor out some new libraries

	word64-map:
		Data.Word64Map
	network-addr:
		Network.Address
	tox-crypto:
		Crypto.Tox
	lifted-concurrent:
		Control.Concurrent.Lifted.Instrument
		Control.Concurrent.Async.Lifted.Instrument
	psq-wrap:
		Data.Wrapper.PSQInt
		Data.Wrapper.PSQ
	minmax-psq:
		Data.MinMaxPSQ
        tasks:
                Control.Concurrent.Tasks
	kad:
		Network.Kademlia
		Network.Kademlia.Bootstrap
		Network.Kademlia.Routing
		Network.Kademlia.CommonAPI
		Network.Kademlia.Persistence
		Network.Kademlia.Search

304 files changed, 1065 insertions, 18 deletions

diff --git a/Announcer.hs b/dht/Announcer.hs
index c6a04cb1..c6a04cb1 100644
--- a/Announcer.hs
+++ b/dht/Announcer.hs
diff --git a/Announcer/Tox.hs b/dht/Announcer/Tox.hs
index f8343f8d..f8343f8d 100644
--- a/Announcer/Tox.hs
+++ b/dht/Announcer/Tox.hs
diff --git a/ChangeLog b/dht/ChangeLog
index 60a1006c..60a1006c 100644
--- a/ChangeLog
+++ b/dht/ChangeLog
diff --git a/Connection.hs b/dht/Connection.hs
index 9a4077f5..9a4077f5 100644
--- a/Connection.hs
+++ b/dht/Connection.hs
diff --git a/Connection/Tcp.hs b/dht/Connection/Tcp.hs
index fd5d333b..fd5d333b 100644
--- a/Connection/Tcp.hs
+++ b/dht/Connection/Tcp.hs
diff --git a/Control/Concurrent/STM/StatusCache.hs b/dht/Control/Concurrent/STM/StatusCache.hs
index d1c977ae..d1c977ae 100644
--- a/Control/Concurrent/STM/StatusCache.hs
+++ b/dht/Control/Concurrent/STM/StatusCache.hs
diff --git a/Control/Concurrent/STM/UpdateStream.hs b/dht/Control/Concurrent/STM/UpdateStream.hs
index 227ffef4..227ffef4 100644
--- a/Control/Concurrent/STM/UpdateStream.hs
+++ b/dht/Control/Concurrent/STM/UpdateStream.hs
diff --git a/Data/BitSyntax.hs b/dht/Data/BitSyntax.hs
index 6d14d0c1..6d14d0c1 100644
--- a/Data/BitSyntax.hs
+++ b/dht/Data/BitSyntax.hs
diff --git a/HandshakeCache.hs b/dht/HandshakeCache.hs
index 61735e8a..61735e8a 100644
--- a/HandshakeCache.hs
+++ b/dht/HandshakeCache.hs
diff --git a/InterruptibleDelay.hs b/dht/InterruptibleDelay.hs
index b2683441..b2683441 100644
--- a/InterruptibleDelay.hs
+++ b/dht/InterruptibleDelay.hs
diff --git a/LICENSE b/dht/LICENSE
index 4c30139e..4c30139e 100644
--- a/LICENSE
+++ b/dht/LICENSE
diff --git a/LLCSNAP.hs b/dht/LLCSNAP.hs
index 417c36ba..417c36ba 100644
--- a/LLCSNAP.hs
+++ b/dht/LLCSNAP.hs
diff --git a/Makefile b/dht/Makefile
index e2eba85f..e2eba85f 100644
--- a/Makefile
+++ b/dht/Makefile
diff --git a/OnionRouter.hs b/dht/OnionRouter.hs
index 57c8ba35..57c8ba35 100644
--- a/OnionRouter.hs
+++ b/dht/OnionRouter.hs
diff --git a/PingMachine.hs b/dht/PingMachine.hs
index ccf5b1d3..ccf5b1d3 100644
--- a/PingMachine.hs
+++ b/dht/PingMachine.hs
diff --git a/Presence/ByteStringOperators.hs b/dht/Presence/ByteStringOperators.hs
index e8485134..e8485134 100644
--- a/Presence/ByteStringOperators.hs
+++ b/dht/Presence/ByteStringOperators.hs
diff --git a/Presence/Chat.hs b/dht/Presence/Chat.hs
index 03bea44b..03bea44b 100644
--- a/Presence/Chat.hs
+++ b/dht/Presence/Chat.hs
diff --git a/Presence/ClientState.hs b/dht/Presence/ClientState.hs
index 08cc54ed..08cc54ed 100644
--- a/Presence/ClientState.hs
+++ b/dht/Presence/ClientState.hs
diff --git a/Presence/ConfigFiles.hs b/dht/Presence/ConfigFiles.hs
index d0164e33..d0164e33 100644
--- a/Presence/ConfigFiles.hs
+++ b/dht/Presence/ConfigFiles.hs
diff --git a/Presence/ConnectionKey.hs b/dht/Presence/ConnectionKey.hs
index ad4eeab7..ad4eeab7 100644
--- a/Presence/ConnectionKey.hs
+++ b/dht/Presence/ConnectionKey.hs
diff --git a/Presence/ConsoleWriter.hs b/dht/Presence/ConsoleWriter.hs
index c6e1871a..c6e1871a 100644
--- a/Presence/ConsoleWriter.hs
+++ b/dht/Presence/ConsoleWriter.hs
diff --git a/Presence/Control/Concurrent/STM/Util.hs b/dht/Presence/Control/Concurrent/STM/Util.hs
index 4be3cff5..4be3cff5 100644
--- a/Presence/Control/Concurrent/STM/Util.hs
+++ b/dht/Presence/Control/Concurrent/STM/Util.hs
diff --git a/Presence/ControlMaybe.hs b/dht/Presence/ControlMaybe.hs
index a101d667..a101d667 100644
--- a/Presence/ControlMaybe.hs
+++ b/dht/Presence/ControlMaybe.hs
diff --git a/Presence/DNSCache.hs b/dht/Presence/DNSCache.hs
index e28655c5..e28655c5 100644
--- a/Presence/DNSCache.hs
+++ b/dht/Presence/DNSCache.hs
diff --git a/Presence/EventUtil.hs b/dht/Presence/EventUtil.hs
index 908e09e0..908e09e0 100644
--- a/Presence/EventUtil.hs
+++ b/dht/Presence/EventUtil.hs
diff --git a/Presence/FGConsole.hs b/dht/Presence/FGConsole.hs
index 03aaebf2..03aaebf2 100644
--- a/Presence/FGConsole.hs
+++ b/dht/Presence/FGConsole.hs
diff --git a/Presence/GetHostByAddr.hs b/dht/Presence/GetHostByAddr.hs
index 45bca5e9..45bca5e9 100644
--- a/Presence/GetHostByAddr.hs
+++ b/dht/Presence/GetHostByAddr.hs
diff --git a/Presence/IDMangler.hs b/dht/Presence/IDMangler.hs
index 664d4f54..664d4f54 100644
--- a/Presence/IDMangler.hs
+++ b/dht/Presence/IDMangler.hs
diff --git a/Presence/LocalChat.hs b/dht/Presence/LocalChat.hs
index eab54a03..eab54a03 100644
--- a/Presence/LocalChat.hs
+++ b/dht/Presence/LocalChat.hs
diff --git a/Presence/LocalPeerCred.hs b/dht/Presence/LocalPeerCred.hs
index f68557e8..f68557e8 100644
--- a/Presence/LocalPeerCred.hs
+++ b/dht/Presence/LocalPeerCred.hs
diff --git a/Presence/LockedChan.hs b/dht/Presence/LockedChan.hs
index eac2b5ad..eac2b5ad 100644
--- a/Presence/LockedChan.hs
+++ b/dht/Presence/LockedChan.hs
diff --git a/Presence/Logging.hs b/dht/Presence/Logging.hs
index b997d341..b997d341 100644
--- a/Presence/Logging.hs
+++ b/dht/Presence/Logging.hs
diff --git a/Presence/MUC.hs b/dht/Presence/MUC.hs
index 639e834b..639e834b 100644
--- a/Presence/MUC.hs
+++ b/dht/Presence/MUC.hs
diff --git a/Presence/Nesting.hs b/dht/Presence/Nesting.hs
index cf47c9fc..cf47c9fc 100644
--- a/Presence/Nesting.hs
+++ b/dht/Presence/Nesting.hs
diff --git a/Presence/Paths.hs b/dht/Presence/Paths.hs
index 9d51b66e..9d51b66e 100644
--- a/Presence/Paths.hs
+++ b/dht/Presence/Paths.hs
diff --git a/Presence/PeerResolve.hs b/dht/Presence/PeerResolve.hs
index 62becfe1..62becfe1 100644
--- a/Presence/PeerResolve.hs
+++ b/dht/Presence/PeerResolve.hs
diff --git a/Presence/Presence.hs b/dht/Presence/Presence.hs
index 8cdd1cdc..8cdd1cdc 100644
--- a/Presence/Presence.hs
+++ b/dht/Presence/Presence.hs
diff --git a/Presence/SockAddr.hs b/dht/Presence/SockAddr.hs
index b5fbf16e..b5fbf16e 100644
--- a/Presence/SockAddr.hs
+++ b/dht/Presence/SockAddr.hs
diff --git a/Presence/Stanza/Build.hs b/dht/Presence/Stanza/Build.hs
index 16552428..16552428 100644
--- a/Presence/Stanza/Build.hs
+++ b/dht/Presence/Stanza/Build.hs
diff --git a/Presence/Stanza/Parse.hs b/dht/Presence/Stanza/Parse.hs
index 58bf7c51..58bf7c51 100644
--- a/Presence/Stanza/Parse.hs
+++ b/dht/Presence/Stanza/Parse.hs
diff --git a/Presence/Stanza/Types.hs b/dht/Presence/Stanza/Types.hs
index 7275c8ab..7275c8ab 100644
--- a/Presence/Stanza/Types.hs
+++ b/dht/Presence/Stanza/Types.hs
diff --git a/Presence/UTmp.hs b/dht/Presence/UTmp.hs
index fcfe529a..fcfe529a 100644
--- a/Presence/UTmp.hs
+++ b/dht/Presence/UTmp.hs
diff --git a/Presence/Util.hs b/dht/Presence/Util.hs
index e19b35fd..e19b35fd 100644
--- a/Presence/Util.hs
+++ b/dht/Presence/Util.hs
diff --git a/Presence/XMPPServer.hs b/dht/Presence/XMPPServer.hs
index fe099fb8..fe099fb8 100644
--- a/Presence/XMPPServer.hs
+++ b/dht/Presence/XMPPServer.hs
diff --git a/Presence/monitortty.c b/dht/Presence/monitortty.c
index 7582aa56..7582aa56 100644
--- a/Presence/monitortty.c
+++ b/dht/Presence/monitortty.c
diff --git a/Setup.hs b/dht/Setup.hs
index bd7c6d3e..bd7c6d3e 100644
--- a/Setup.hs
+++ b/dht/Setup.hs
diff --git a/TCPProber.hs b/dht/TCPProber.hs
index 5e011116..5e011116 100644
--- a/TCPProber.hs
+++ b/dht/TCPProber.hs
diff --git a/TODO.org b/dht/TODO.org
index dbba5c8c..dbba5c8c 100644
--- a/TODO.org
+++ b/dht/TODO.org
diff --git a/ToxChat.hs b/dht/ToxChat.hs
index fba5d33b..fba5d33b 100644
--- a/ToxChat.hs
+++ b/dht/ToxChat.hs
diff --git a/ToxManager.hs b/dht/ToxManager.hs
index dceb9210..dceb9210 100644
--- a/ToxManager.hs
+++ b/dht/ToxManager.hs
diff --git a/ToxToXMPP.hs b/dht/ToxToXMPP.hs
index 1420c642..1420c642 100644
--- a/ToxToXMPP.hs
+++ b/dht/ToxToXMPP.hs
diff --git a/TraversableT.hs b/dht/TraversableT.hs
index c0e40853..c0e40853 100644
--- a/TraversableT.hs
+++ b/dht/TraversableT.hs
diff --git a/WifiHeader.hs b/dht/WifiHeader.hs
index 90e77003..90e77003 100644
--- a/WifiHeader.hs
+++ b/dht/WifiHeader.hs
diff --git a/XMPPToTox.hs b/dht/XMPPToTox.hs
index 33e6ae04..33e6ae04 100644
--- a/XMPPToTox.hs
+++ b/dht/XMPPToTox.hs
diff --git a/b b/dht/b
index a116163e..a116163e 100755
--- a/b
+++ b/dht/b
diff --git a/bittorrent/README.md b/dht/bittorrent/README.md
index 32948896..32948896 100644
--- a/bittorrent/README.md
+++ b/dht/bittorrent/README.md
diff --git a/bittorrent/Readme.md b/dht/bittorrent/Readme.md
index e092c3ad..e092c3ad 100644
--- a/bittorrent/Readme.md
+++ b/dht/bittorrent/Readme.md
diff --git a/bittorrent/bench/Main.hs b/dht/bittorrent/bench/Main.hs
index f04485ab..f04485ab 100644
--- a/bittorrent/bench/Main.hs
+++ b/dht/bittorrent/bench/Main.hs
diff --git a/bittorrent/bench/Throughtput.hs b/dht/bittorrent/bench/Throughtput.hs
index d0404405..d0404405 100644
--- a/bittorrent/bench/Throughtput.hs
+++ b/dht/bittorrent/bench/Throughtput.hs
diff --git a/bittorrent/bench/TorrentFile.hs b/dht/bittorrent/bench/TorrentFile.hs
index e91a9c10..e91a9c10 100644
--- a/bittorrent/bench/TorrentFile.hs
+++ b/dht/bittorrent/bench/TorrentFile.hs
diff --git a/bittorrent/bittorrent.cabal b/dht/bittorrent/bittorrent.cabal
index 8ec314e7..8ec314e7 100644
--- a/bittorrent/bittorrent.cabal
+++ b/dht/bittorrent/bittorrent.cabal
diff --git a/bittorrent/dev/README.md b/dht/bittorrent/dev/README.md
index e2cc51a6..e2cc51a6 100644
--- a/bittorrent/dev/README.md
+++ b/dht/bittorrent/dev/README.md
diff --git a/bittorrent/dev/add-sources.sh b/dht/bittorrent/dev/add-sources.sh
index e125cade..e125cade 100755
--- a/bittorrent/dev/add-sources.sh
+++ b/dht/bittorrent/dev/add-sources.sh
diff --git a/bittorrent/dev/bench b/dht/bittorrent/dev/bench
index 5d03db3f..5d03db3f 100755
--- a/bittorrent/dev/bench
+++ b/dht/bittorrent/dev/bench
diff --git a/bittorrent/dev/test b/dht/bittorrent/dev/test
index 2eb85df2..2eb85df2 100755
--- a/bittorrent/dev/test
+++ b/dht/bittorrent/dev/test
diff --git a/bittorrent/dev/update-dependencies.sh b/dht/bittorrent/dev/update-dependencies.sh
index c83694c3..c83694c3 100755
--- a/bittorrent/dev/update-dependencies.sh
+++ b/dht/bittorrent/dev/update-dependencies.sh
diff --git a/bittorrent/examples/Client.hs b/dht/bittorrent/examples/Client.hs
index 26711676..26711676 100644
--- a/bittorrent/examples/Client.hs
+++ b/dht/bittorrent/examples/Client.hs
diff --git a/bittorrent/examples/FS.hs b/dht/bittorrent/examples/FS.hs
index 550d85a7..550d85a7 100644
--- a/bittorrent/examples/FS.hs
+++ b/dht/bittorrent/examples/FS.hs
diff --git a/bittorrent/examples/MkTorrent.hs b/dht/bittorrent/examples/MkTorrent.hs
index 88a84893..88a84893 100644
--- a/bittorrent/examples/MkTorrent.hs
+++ b/dht/bittorrent/examples/MkTorrent.hs
diff --git a/bittorrent/res/dapper-dvd-amd64.iso.torrent b/dht/bittorrent/res/dapper-dvd-amd64.iso.torrent
index 5713344b..5713344b 100644
--- a/bittorrent/res/dapper-dvd-amd64.iso.torrent
+++ b/dht/bittorrent/res/dapper-dvd-amd64.iso.torrent
diff --git a/bittorrent/res/pkg.torrent b/dht/bittorrent/res/pkg.torrent
index be89e9e0..be89e9e0 100644
--- a/bittorrent/res/pkg.torrent
+++ b/dht/bittorrent/res/pkg.torrent
diff --git a/bittorrent/res/testfile b/dht/bittorrent/res/testfile
index 8e984818..8e984818 100644
--- a/bittorrent/res/testfile
+++ b/dht/bittorrent/res/testfile
diff --git a/bittorrent/res/testfile.torrent b/dht/bittorrent/res/testfile.torrent
index 297f56a2..297f56a2 100644
--- a/bittorrent/res/testfile.torrent
+++ b/dht/bittorrent/res/testfile.torrent
diff --git a/bittorrent/src/Network/BitTorrent.hs b/dht/bittorrent/src/Network/BitTorrent.hs
index 91a58887..91a58887 100644
--- a/bittorrent/src/Network/BitTorrent.hs
+++ b/dht/bittorrent/src/Network/BitTorrent.hs
diff --git a/bittorrent/src/Network/BitTorrent/Client.hs b/dht/bittorrent/src/Network/BitTorrent/Client.hs
index c84290dd..c84290dd 100644
--- a/bittorrent/src/Network/BitTorrent/Client.hs
+++ b/dht/bittorrent/src/Network/BitTorrent/Client.hs
diff --git a/bittorrent/src/Network/BitTorrent/Client/Handle.hs b/dht/bittorrent/src/Network/BitTorrent/Client/Handle.hs
index 66baac48..66baac48 100644
--- a/bittorrent/src/Network/BitTorrent/Client/Handle.hs
+++ b/dht/bittorrent/src/Network/BitTorrent/Client/Handle.hs
diff --git a/bittorrent/src/Network/BitTorrent/Client/Types.hs b/dht/bittorrent/src/Network/BitTorrent/Client/Types.hs
index e2ad858f..e2ad858f 100644
--- a/bittorrent/src/Network/BitTorrent/Client/Types.hs
+++ b/dht/bittorrent/src/Network/BitTorrent/Client/Types.hs
diff --git a/bittorrent/src/Network/BitTorrent/Exchange.hs b/dht/bittorrent/src/Network/BitTorrent/Exchange.hs
index 143bf090..143bf090 100644
--- a/bittorrent/src/Network/BitTorrent/Exchange.hs
+++ b/dht/bittorrent/src/Network/BitTorrent/Exchange.hs
diff --git a/bittorrent/src/Network/BitTorrent/Exchange/Bitfield.hs b/dht/bittorrent/src/Network/BitTorrent/Exchange/Bitfield.hs
index 1be9f970..1be9f970 100644
--- a/bittorrent/src/Network/BitTorrent/Exchange/Bitfield.hs
+++ b/dht/bittorrent/src/Network/BitTorrent/Exchange/Bitfield.hs
diff --git a/bittorrent/src/Network/BitTorrent/Exchange/Block.hs b/dht/bittorrent/src/Network/BitTorrent/Exchange/Block.hs
index bc9a3d24..bc9a3d24 100644
--- a/bittorrent/src/Network/BitTorrent/Exchange/Block.hs
+++ b/dht/bittorrent/src/Network/BitTorrent/Exchange/Block.hs
diff --git a/bittorrent/src/Network/BitTorrent/Exchange/Connection.hs b/dht/bittorrent/src/Network/BitTorrent/Exchange/Connection.hs
index 6804d0a2..6804d0a2 100644
--- a/bittorrent/src/Network/BitTorrent/Exchange/Connection.hs
+++ b/dht/bittorrent/src/Network/BitTorrent/Exchange/Connection.hs
diff --git a/bittorrent/src/Network/BitTorrent/Exchange/Download.hs b/dht/bittorrent/src/Network/BitTorrent/Exchange/Download.hs
index 981db2fb..981db2fb 100644
--- a/bittorrent/src/Network/BitTorrent/Exchange/Download.hs
+++ b/dht/bittorrent/src/Network/BitTorrent/Exchange/Download.hs
diff --git a/bittorrent/src/Network/BitTorrent/Exchange/Manager.hs b/dht/bittorrent/src/Network/BitTorrent/Exchange/Manager.hs
index 30a6a607..30a6a607 100644
--- a/bittorrent/src/Network/BitTorrent/Exchange/Manager.hs
+++ b/dht/bittorrent/src/Network/BitTorrent/Exchange/Manager.hs
diff --git a/bittorrent/src/Network/BitTorrent/Exchange/Message.hs b/dht/bittorrent/src/Network/BitTorrent/Exchange/Message.hs
index 5c096523..5c096523 100644
--- a/bittorrent/src/Network/BitTorrent/Exchange/Message.hs
+++ b/dht/bittorrent/src/Network/BitTorrent/Exchange/Message.hs
diff --git a/bittorrent/src/Network/BitTorrent/Exchange/Session.hs b/dht/bittorrent/src/Network/BitTorrent/Exchange/Session.hs
index 38a3c3a6..38a3c3a6 100644
--- a/bittorrent/src/Network/BitTorrent/Exchange/Session.hs
+++ b/dht/bittorrent/src/Network/BitTorrent/Exchange/Session.hs
diff --git a/bittorrent/src/Network/BitTorrent/Internal/Cache.hs b/dht/bittorrent/src/Network/BitTorrent/Internal/Cache.hs
index 8c74467a..8c74467a 100644
--- a/bittorrent/src/Network/BitTorrent/Internal/Cache.hs
+++ b/dht/bittorrent/src/Network/BitTorrent/Internal/Cache.hs
diff --git a/bittorrent/src/Network/BitTorrent/Internal/Progress.hs b/dht/bittorrent/src/Network/BitTorrent/Internal/Progress.hs
index 6ac889e2..6ac889e2 100644
--- a/bittorrent/src/Network/BitTorrent/Internal/Progress.hs
+++ b/dht/bittorrent/src/Network/BitTorrent/Internal/Progress.hs
diff --git a/bittorrent/src/Network/BitTorrent/Internal/Types.hs b/dht/bittorrent/src/Network/BitTorrent/Internal/Types.hs
index d157db3e..d157db3e 100644
--- a/bittorrent/src/Network/BitTorrent/Internal/Types.hs
+++ b/dht/bittorrent/src/Network/BitTorrent/Internal/Types.hs
diff --git a/bittorrent/src/Network/BitTorrent/Readme.md b/dht/bittorrent/src/Network/BitTorrent/Readme.md
index ebf9545e..ebf9545e 100644
--- a/bittorrent/src/Network/BitTorrent/Readme.md
+++ b/dht/bittorrent/src/Network/BitTorrent/Readme.md
diff --git a/bittorrent/src/Network/BitTorrent/Tracker.hs b/dht/bittorrent/src/Network/BitTorrent/Tracker.hs
index 1191f921..1191f921 100644
--- a/bittorrent/src/Network/BitTorrent/Tracker.hs
+++ b/dht/bittorrent/src/Network/BitTorrent/Tracker.hs
diff --git a/bittorrent/src/Network/BitTorrent/Tracker/List.hs b/dht/bittorrent/src/Network/BitTorrent/Tracker/List.hs
index 1507b4be..1507b4be 100644
--- a/bittorrent/src/Network/BitTorrent/Tracker/List.hs
+++ b/dht/bittorrent/src/Network/BitTorrent/Tracker/List.hs
diff --git a/bittorrent/src/Network/BitTorrent/Tracker/Message.hs b/dht/bittorrent/src/Network/BitTorrent/Tracker/Message.hs
index ab492275..ab492275 100644
--- a/bittorrent/src/Network/BitTorrent/Tracker/Message.hs
+++ b/dht/bittorrent/src/Network/BitTorrent/Tracker/Message.hs
diff --git a/bittorrent/src/Network/BitTorrent/Tracker/RPC.hs b/dht/bittorrent/src/Network/BitTorrent/Tracker/RPC.hs
index 45fef05e..45fef05e 100644
--- a/bittorrent/src/Network/BitTorrent/Tracker/RPC.hs
+++ b/dht/bittorrent/src/Network/BitTorrent/Tracker/RPC.hs
diff --git a/bittorrent/src/Network/BitTorrent/Tracker/RPC/HTTP.hs b/dht/bittorrent/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
index 6f7a53bf..6f7a53bf 100644
--- a/bittorrent/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
+++ b/dht/bittorrent/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
diff --git a/bittorrent/src/Network/BitTorrent/Tracker/RPC/UDP.hs b/dht/bittorrent/src/Network/BitTorrent/Tracker/RPC/UDP.hs
index 31b6b870..31b6b870 100644
--- a/bittorrent/src/Network/BitTorrent/Tracker/RPC/UDP.hs
+++ b/dht/bittorrent/src/Network/BitTorrent/Tracker/RPC/UDP.hs
diff --git a/bittorrent/src/Network/BitTorrent/Tracker/Session.hs b/dht/bittorrent/src/Network/BitTorrent/Tracker/Session.hs
index db6ebaff..db6ebaff 100644
--- a/bittorrent/src/Network/BitTorrent/Tracker/Session.hs
+++ b/dht/bittorrent/src/Network/BitTorrent/Tracker/Session.hs
diff --git a/bittorrent/src/System/Torrent/FileMap.hs b/dht/bittorrent/src/System/Torrent/FileMap.hs
index 38c475e8..38c475e8 100644
--- a/bittorrent/src/System/Torrent/FileMap.hs
+++ b/dht/bittorrent/src/System/Torrent/FileMap.hs
diff --git a/bittorrent/src/System/Torrent/Storage.hs b/dht/bittorrent/src/System/Torrent/Storage.hs
index 1d77e55d..1d77e55d 100644
--- a/bittorrent/src/System/Torrent/Storage.hs
+++ b/dht/bittorrent/src/System/Torrent/Storage.hs
diff --git a/bittorrent/src/System/Torrent/Tree.hs b/dht/bittorrent/src/System/Torrent/Tree.hs
index 41cfb360..41cfb360 100644
--- a/bittorrent/src/System/Torrent/Tree.hs
+++ b/dht/bittorrent/src/System/Torrent/Tree.hs
diff --git a/bittorrent/tests/Config.hs b/dht/bittorrent/tests/Config.hs
index 55e30867..55e30867 100644
--- a/bittorrent/tests/Config.hs
+++ b/dht/bittorrent/tests/Config.hs
diff --git a/bittorrent/tests/Data/TorrentSpec.hs b/dht/bittorrent/tests/Data/TorrentSpec.hs
index b4a280e4..b4a280e4 100644
--- a/bittorrent/tests/Data/TorrentSpec.hs
+++ b/dht/bittorrent/tests/Data/TorrentSpec.hs
diff --git a/bittorrent/tests/Main.hs b/dht/bittorrent/tests/Main.hs
index 5ed953da..5ed953da 100644
--- a/bittorrent/tests/Main.hs
+++ b/dht/bittorrent/tests/Main.hs
diff --git a/bittorrent/tests/Network/BitTorrent/Client/HandleSpec.hs b/dht/bittorrent/tests/Network/BitTorrent/Client/HandleSpec.hs
index d51bab02..d51bab02 100644
--- a/bittorrent/tests/Network/BitTorrent/Client/HandleSpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/Client/HandleSpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/CoreSpec.hs b/dht/bittorrent/tests/Network/BitTorrent/CoreSpec.hs
index e9b17a42..e9b17a42 100644
--- a/bittorrent/tests/Network/BitTorrent/CoreSpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/CoreSpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/DHT/MessageSpec.hs b/dht/bittorrent/tests/Network/BitTorrent/DHT/MessageSpec.hs
index 6f3c7489..6f3c7489 100644
--- a/bittorrent/tests/Network/BitTorrent/DHT/MessageSpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/DHT/MessageSpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/DHT/QuerySpec.hs b/dht/bittorrent/tests/Network/BitTorrent/DHT/QuerySpec.hs
index 93f78263..93f78263 100644
--- a/bittorrent/tests/Network/BitTorrent/DHT/QuerySpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/DHT/QuerySpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/DHT/RoutingSpec.hs b/dht/bittorrent/tests/Network/BitTorrent/DHT/RoutingSpec.hs
index 07a906ba..07a906ba 100644
--- a/bittorrent/tests/Network/BitTorrent/DHT/RoutingSpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/DHT/RoutingSpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/DHT/SessionSpec.hs b/dht/bittorrent/tests/Network/BitTorrent/DHT/SessionSpec.hs
index 32e4c158..32e4c158 100644
--- a/bittorrent/tests/Network/BitTorrent/DHT/SessionSpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/DHT/SessionSpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/DHT/TestData.hs b/dht/bittorrent/tests/Network/BitTorrent/DHT/TestData.hs
index e9473cbb..e9473cbb 100644
--- a/bittorrent/tests/Network/BitTorrent/DHT/TestData.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/DHT/TestData.hs
diff --git a/bittorrent/tests/Network/BitTorrent/DHT/TokenSpec.hs b/dht/bittorrent/tests/Network/BitTorrent/DHT/TokenSpec.hs
index a45d2212..a45d2212 100644
--- a/bittorrent/tests/Network/BitTorrent/DHT/TokenSpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/DHT/TokenSpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/DHTSpec.hs b/dht/bittorrent/tests/Network/BitTorrent/DHTSpec.hs
index 77160eb5..77160eb5 100644
--- a/bittorrent/tests/Network/BitTorrent/DHTSpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/DHTSpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/Exchange/BitfieldSpec.hs b/dht/bittorrent/tests/Network/BitTorrent/Exchange/BitfieldSpec.hs
index 1ba772f6..1ba772f6 100644
--- a/bittorrent/tests/Network/BitTorrent/Exchange/BitfieldSpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/Exchange/BitfieldSpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/Exchange/BlockSpec.hs b/dht/bittorrent/tests/Network/BitTorrent/Exchange/BlockSpec.hs
index 2dc8e0b8..2dc8e0b8 100644
--- a/bittorrent/tests/Network/BitTorrent/Exchange/BlockSpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/Exchange/BlockSpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/Exchange/ConnectionSpec.hs b/dht/bittorrent/tests/Network/BitTorrent/Exchange/ConnectionSpec.hs
index d654cda1..d654cda1 100644
--- a/bittorrent/tests/Network/BitTorrent/Exchange/ConnectionSpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/Exchange/ConnectionSpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/Exchange/DownloadSpec.hs b/dht/bittorrent/tests/Network/BitTorrent/Exchange/DownloadSpec.hs
index d46f2034..d46f2034 100644
--- a/bittorrent/tests/Network/BitTorrent/Exchange/DownloadSpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/Exchange/DownloadSpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/Exchange/MessageSpec.hs b/dht/bittorrent/tests/Network/BitTorrent/Exchange/MessageSpec.hs
index d615b1ff..d615b1ff 100644
--- a/bittorrent/tests/Network/BitTorrent/Exchange/MessageSpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/Exchange/MessageSpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/Exchange/SessionSpec.hs b/dht/bittorrent/tests/Network/BitTorrent/Exchange/SessionSpec.hs
index bf5b95a1..bf5b95a1 100644
--- a/bittorrent/tests/Network/BitTorrent/Exchange/SessionSpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/Exchange/SessionSpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/Internal/CacheSpec.hs b/dht/bittorrent/tests/Network/BitTorrent/Internal/CacheSpec.hs
index 337e7add..337e7add 100644
--- a/bittorrent/tests/Network/BitTorrent/Internal/CacheSpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/Internal/CacheSpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/Internal/ProgressSpec.hs b/dht/bittorrent/tests/Network/BitTorrent/Internal/ProgressSpec.hs
index acbfd84c..acbfd84c 100644
--- a/bittorrent/tests/Network/BitTorrent/Internal/ProgressSpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/Internal/ProgressSpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/Tracker/ListSpec.hs b/dht/bittorrent/tests/Network/BitTorrent/Tracker/ListSpec.hs
index bba9d0e2..bba9d0e2 100644
--- a/bittorrent/tests/Network/BitTorrent/Tracker/ListSpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/Tracker/ListSpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/Tracker/MessageSpec.hs b/dht/bittorrent/tests/Network/BitTorrent/Tracker/MessageSpec.hs
index 29854d58..29854d58 100644
--- a/bittorrent/tests/Network/BitTorrent/Tracker/MessageSpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/Tracker/MessageSpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/Tracker/RPC/HTTPSpec.hs b/dht/bittorrent/tests/Network/BitTorrent/Tracker/RPC/HTTPSpec.hs
index e928f917..e928f917 100644
--- a/bittorrent/tests/Network/BitTorrent/Tracker/RPC/HTTPSpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/Tracker/RPC/HTTPSpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs b/dht/bittorrent/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs
index 73acb3fa..73acb3fa 100644
--- a/bittorrent/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/Tracker/RPCSpec.hs b/dht/bittorrent/tests/Network/BitTorrent/Tracker/RPCSpec.hs
index dfc13a1e..dfc13a1e 100644
--- a/bittorrent/tests/Network/BitTorrent/Tracker/RPCSpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/Tracker/RPCSpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/Tracker/SessionSpec.hs b/dht/bittorrent/tests/Network/BitTorrent/Tracker/SessionSpec.hs
index 72936ee7..72936ee7 100644
--- a/bittorrent/tests/Network/BitTorrent/Tracker/SessionSpec.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/Tracker/SessionSpec.hs
diff --git a/bittorrent/tests/Network/BitTorrent/Tracker/TestData.hs b/dht/bittorrent/tests/Network/BitTorrent/Tracker/TestData.hs
index b95e2df4..b95e2df4 100644
--- a/bittorrent/tests/Network/BitTorrent/Tracker/TestData.hs
+++ b/dht/bittorrent/tests/Network/BitTorrent/Tracker/TestData.hs
diff --git a/bittorrent/tests/Network/KRPC/MessageSpec.hs b/dht/bittorrent/tests/Network/KRPC/MessageSpec.hs
index 498ef679..498ef679 100644
--- a/bittorrent/tests/Network/KRPC/MessageSpec.hs
+++ b/dht/bittorrent/tests/Network/KRPC/MessageSpec.hs
diff --git a/bittorrent/tests/Network/KRPC/MethodSpec.hs b/dht/bittorrent/tests/Network/KRPC/MethodSpec.hs
index c1c58282..c1c58282 100644
--- a/bittorrent/tests/Network/KRPC/MethodSpec.hs
+++ b/dht/bittorrent/tests/Network/KRPC/MethodSpec.hs
diff --git a/bittorrent/tests/Network/KRPCSpec.hs b/dht/bittorrent/tests/Network/KRPCSpec.hs
index eabcc817..eabcc817 100644
--- a/bittorrent/tests/Network/KRPCSpec.hs
+++ b/dht/bittorrent/tests/Network/KRPCSpec.hs
diff --git a/bittorrent/tests/Readme.md b/dht/bittorrent/tests/Readme.md
index 7a9d8914..7a9d8914 100644
--- a/bittorrent/tests/Readme.md
+++ b/dht/bittorrent/tests/Readme.md
diff --git a/bittorrent/tests/Spec.hs b/dht/bittorrent/tests/Spec.hs
index b4e92e75..b4e92e75 100644
--- a/bittorrent/tests/Spec.hs
+++ b/dht/bittorrent/tests/Spec.hs
diff --git a/bittorrent/tests/System/Torrent/FileMapSpec.hs b/dht/bittorrent/tests/System/Torrent/FileMapSpec.hs
index 29252925..29252925 100644
--- a/bittorrent/tests/System/Torrent/FileMapSpec.hs
+++ b/dht/bittorrent/tests/System/Torrent/FileMapSpec.hs
diff --git a/bittorrent/tests/System/Torrent/StorageSpec.hs b/dht/bittorrent/tests/System/Torrent/StorageSpec.hs
index b5e49078..b5e49078 100644
--- a/bittorrent/tests/System/Torrent/StorageSpec.hs
+++ b/dht/bittorrent/tests/System/Torrent/StorageSpec.hs
diff --git a/bp b/dht/bp
index 8d3335d4..8d3335d4 100755
--- a/bp
+++ b/dht/bp
diff --git a/c b/dht/c
index ed905d3d..ed905d3d 100755
--- a/c
+++ b/dht/c
diff --git a/cbits/cryptonite_bitfn.h b/dht/cbits/cryptonite_bitfn.h
index 3a00dd8a..3a00dd8a 100644
--- a/cbits/cryptonite_bitfn.h
+++ b/dht/cbits/cryptonite_bitfn.h
diff --git a/cbits/cryptonite_salsa.c b/dht/cbits/cryptonite_salsa.c
index 0bd96607..0bd96607 100644
--- a/cbits/cryptonite_salsa.c
+++ b/dht/cbits/cryptonite_salsa.c
diff --git a/cbits/cryptonite_salsa.h b/dht/cbits/cryptonite_salsa.h
index 33e9cda9..33e9cda9 100644
--- a/cbits/cryptonite_salsa.h
+++ b/dht/cbits/cryptonite_salsa.h
diff --git a/cbits/cryptonite_xsalsa.c b/dht/cbits/cryptonite_xsalsa.c
index 6718cd7d..6718cd7d 100644
--- a/cbits/cryptonite_xsalsa.c
+++ b/dht/cbits/cryptonite_xsalsa.c
diff --git a/cbits/cryptonite_xsalsa.h b/dht/cbits/cryptonite_xsalsa.h
index 73233cee..73233cee 100644
--- a/cbits/cryptonite_xsalsa.h
+++ b/dht/cbits/cryptonite_xsalsa.h
diff --git a/ci b/dht/ci
index 52e7c6b7..52e7c6b7 100755
--- a/ci
+++ b/dht/ci
diff --git a/conn-notes.txt b/dht/conn-notes.txt
index 257987d1..257987d1 100644
--- a/conn-notes.txt
+++ b/dht/conn-notes.txt
diff --git a/cryptonite-backport/Crypto/Cipher/Salsa.hs b/dht/cryptonite-backport/Crypto/Cipher/Salsa.hs
index b6b188b1..b6b188b1 100644
--- a/cryptonite-backport/Crypto/Cipher/Salsa.hs
+++ b/dht/cryptonite-backport/Crypto/Cipher/Salsa.hs
diff --git a/cryptonite-backport/Crypto/Cipher/XSalsa.hs b/dht/cryptonite-backport/Crypto/Cipher/XSalsa.hs
index 494760e2..494760e2 100644
--- a/cryptonite-backport/Crypto/Cipher/XSalsa.hs
+++ b/dht/cryptonite-backport/Crypto/Cipher/XSalsa.hs
diff --git a/cryptonite-backport/Crypto/ECC/Class.hs b/dht/cryptonite-backport/Crypto/ECC/Class.hs
index 16b2cc15..16b2cc15 100644
--- a/cryptonite-backport/Crypto/ECC/Class.hs
+++ b/dht/cryptonite-backport/Crypto/ECC/Class.hs
diff --git a/cryptonite-backport/Crypto/ECC/Simple/Prim.hs b/dht/cryptonite-backport/Crypto/ECC/Simple/Prim.hs
index 117988f2..117988f2 100644
--- a/cryptonite-backport/Crypto/ECC/Simple/Prim.hs
+++ b/dht/cryptonite-backport/Crypto/ECC/Simple/Prim.hs
diff --git a/cryptonite-backport/Crypto/ECC/Simple/Types.hs b/dht/cryptonite-backport/Crypto/ECC/Simple/Types.hs
index c97daa29..c97daa29 100644
--- a/cryptonite-backport/Crypto/ECC/Simple/Types.hs
+++ b/dht/cryptonite-backport/Crypto/ECC/Simple/Types.hs
diff --git a/cryptonite-backport/Crypto/Error/Types.hs b/dht/cryptonite-backport/Crypto/Error/Types.hs
index 4aaf4e04..4aaf4e04 100644
--- a/cryptonite-backport/Crypto/Error/Types.hs
+++ b/dht/cryptonite-backport/Crypto/Error/Types.hs
diff --git a/cryptonite-backport/Crypto/Internal/ByteArray.hs b/dht/cryptonite-backport/Crypto/Internal/ByteArray.hs
index 3a23152d..3a23152d 100644
--- a/cryptonite-backport/Crypto/Internal/ByteArray.hs
+++ b/dht/cryptonite-backport/Crypto/Internal/ByteArray.hs
diff --git a/cryptonite-backport/Crypto/Internal/Compat.hs b/dht/cryptonite-backport/Crypto/Internal/Compat.hs
index a3712a7c..a3712a7c 100644
--- a/cryptonite-backport/Crypto/Internal/Compat.hs
+++ b/dht/cryptonite-backport/Crypto/Internal/Compat.hs
diff --git a/cryptonite-backport/Crypto/Internal/DeepSeq.hs b/dht/cryptonite-backport/Crypto/Internal/DeepSeq.hs
index 9da79881..9da79881 100644
--- a/cryptonite-backport/Crypto/Internal/DeepSeq.hs
+++ b/dht/cryptonite-backport/Crypto/Internal/DeepSeq.hs
diff --git a/cryptonite-backport/Crypto/Internal/Imports.hs b/dht/cryptonite-backport/Crypto/Internal/Imports.hs
index 4ed44e16..4ed44e16 100644
--- a/cryptonite-backport/Crypto/Internal/Imports.hs
+++ b/dht/cryptonite-backport/Crypto/Internal/Imports.hs
diff --git a/cryptonite-backport/Crypto/PubKey/Curve25519.hs b/dht/cryptonite-backport/Crypto/PubKey/Curve25519.hs
index 42878691..42878691 100644
--- a/cryptonite-backport/Crypto/PubKey/Curve25519.hs
+++ b/dht/cryptonite-backport/Crypto/PubKey/Curve25519.hs
diff --git a/dht-client.cabal b/dht/dht-client.cabal
index 415e9289..7355bae6 100644
--- a/dht-client.cabal
+++ b/dht/dht-client.cabal
@@ -76,29 +76,17 @@ library
                     Data.Digest.CRC32C
                     Data.Bits.ByteString
                     Data.TableMethods
-                    Data.Wrapper.PSQ
-                    Data.Wrapper.PSQInt
-                    Data.MinMaxPSQ
-                    Network.Address
-                    Network.Kademlia.Bootstrap
-                    Network.Kademlia.Routing
                     Data.Torrent
                     Network.BitTorrent.DHT.ContactInfo
                     Network.BitTorrent.DHT.Token
-                    Network.Kademlia.Search
                     Network.QueryResponse
                     Network.StreamServer
                     Data.BEncode.Pretty
-                    Control.Concurrent.Tasks
-                    Network.Kademlia
-                    Network.Kademlia.CommonAPI
-                    Network.Kademlia.Persistence
                     Network.BitTorrent.MainlineDHT
                     Network.BitTorrent.MainlineDHT.Symbols
                     System.Global6
                     Data.PacketQueue
                     Data.PacketBuffer
-                    Data.Word64Map
                     OnionRouter
                     TCPProber
                     Data.Tox.Onion
@@ -119,7 +107,6 @@ library
                     Data.Tox.Msg
                     Data.Tox.Relay
                     Control.TriadCommittee
-                    Crypto.Tox
                     Text.XXD
                     Network.Tox.ContactInfo
                     Announcer
@@ -227,6 +214,14 @@ library
                     , hinotify
                     , avahi >= 0.2.0
                     , hslogger
+                    , word64-map
+                    , network-addr
+                    , tox-crypto
+                    , lifted-concurrent
+                    , psq-wrap
+                    , minmax-psq
+                    , kad
+                    , tasks
 
   if impl(ghc < 8)
       Build-depends:  transformers
@@ -251,7 +246,7 @@ library
   build-depends: aeson, aeson-pretty, unordered-containers, vector
   cpp-options:   -DBENCODE_AESON -DRENDERFLUSH
   if flag(thread-debug)
-    exposed-modules: Control.Concurrent.Lifted.Instrument
+    -- exposed-modules: Control.Concurrent.Lifted.Instrument
     cpp-options:   -DTHREAD_DEBUG
 
   if flag(builder)
diff --git a/doc/rfc6120.html b/dht/doc/rfc6120.html
index fa7ef081..fa7ef081 100644
--- a/doc/rfc6120.html
+++ b/dht/doc/rfc6120.html
diff --git a/doc/rfc6121.html b/dht/doc/rfc6121.html
index bd00706c..bd00706c 100644
--- a/doc/rfc6121.html
+++ b/dht/doc/rfc6121.html
diff --git a/examples/AliceBob.hs b/dht/examples/AliceBob.hs
index 529b92d5..529b92d5 100644
--- a/examples/AliceBob.hs
+++ b/dht/examples/AliceBob.hs
diff --git a/examples/atox.hs b/dht/examples/atox.hs
index 3bae5203..3bae5203 100644
--- a/examples/atox.hs
+++ b/dht/examples/atox.hs
diff --git a/examples/avahi.hs b/dht/examples/avahi.hs
index e5567875..e5567875 100644
--- a/examples/avahi.hs
+++ b/dht/examples/avahi.hs
diff --git a/examples/consolation.hs b/dht/examples/consolation.hs
index 0c576dfc..0c576dfc 100644
--- a/examples/consolation.hs
+++ b/dht/examples/consolation.hs
diff --git a/examples/dht.hs b/dht/examples/dht.hs
index 3e1b1656..3e1b1656 100644
--- a/examples/dht.hs
+++ b/dht/examples/dht.hs
diff --git a/examples/dhtd.hs b/dht/examples/dhtd.hs
index 2772416b..2772416b 100644
--- a/examples/dhtd.hs
+++ b/dht/examples/dhtd.hs
diff --git a/examples/nalias.hs b/dht/examples/nalias.hs
index fa1b6f71..fa1b6f71 100644
--- a/examples/nalias.hs
+++ b/dht/examples/nalias.hs
diff --git a/examples/nalias2.hs b/dht/examples/nalias2.hs
index 609f2ec6..609f2ec6 100644
--- a/examples/nalias2.hs
+++ b/dht/examples/nalias2.hs
diff --git a/examples/pjson.hs b/dht/examples/pjson.hs
index a515febb..a515febb 100644
--- a/examples/pjson.hs
+++ b/dht/examples/pjson.hs
diff --git a/examples/pwrite.hs b/dht/examples/pwrite.hs
index bad6af06..bad6af06 100644
--- a/examples/pwrite.hs
+++ b/dht/examples/pwrite.hs
diff --git a/examples/test-xmpp.hs b/dht/examples/test-xmpp.hs
index a8e20c3c..a8e20c3c 100644
--- a/examples/test-xmpp.hs
+++ b/dht/examples/test-xmpp.hs
diff --git a/examples/testTox.hs b/dht/examples/testTox.hs
index 67c4daef..67c4daef 100644
--- a/examples/testTox.hs
+++ b/dht/examples/testTox.hs
diff --git a/examples/testcookie.hs b/dht/examples/testcookie.hs
index 4302ad35..4302ad35 100644
--- a/examples/testcookie.hs
+++ b/dht/examples/testcookie.hs
diff --git a/examples/toxrelay.hs b/dht/examples/toxrelay.hs
index af08e8d7..af08e8d7 100644
--- a/examples/toxrelay.hs
+++ b/dht/examples/toxrelay.hs
diff --git a/examples/whosocket.hs b/dht/examples/whosocket.hs
index f84e3178..f84e3178 100644
--- a/examples/whosocket.hs
+++ b/dht/examples/whosocket.hs
diff --git a/examples/xmppServer.hs b/dht/examples/xmppServer.hs
index b0a53e8b..b0a53e8b 100644
--- a/examples/xmppServer.hs
+++ b/dht/examples/xmppServer.hs
diff --git a/g b/dht/g
index 4ebe82ed..4ebe82ed 100755
--- a/g
+++ b/dht/g
diff --git a/gi b/dht/gi
index 833cac1b..833cac1b 100755
--- a/gi
+++ b/dht/gi
diff --git a/graphdeps b/dht/graphdeps
index 4ee6939a..4ee6939a 100755
--- a/graphdeps
+++ b/dht/graphdeps
diff --git a/modules.svg b/dht/modules.svg
index 32e85a40..32e85a40 100644
--- a/modules.svg
+++ b/dht/modules.svg
diff --git a/p b/dht/p
index 357606ad..357606ad 100755
--- a/p
+++ b/dht/p
diff --git a/presence.cabal.bak b/dht/presence.cabal.bak
index 81ca59b2..81ca59b2 100644
--- a/presence.cabal.bak
+++ b/dht/presence.cabal.bak
diff --git a/presence.service b/dht/presence.service
index 85f20cda..85f20cda 100644
--- a/presence.service
+++ b/dht/presence.service
diff --git a/readpackets.hs b/dht/readpackets.hs
index 690aa91e..690aa91e 100644
--- a/readpackets.hs
+++ b/dht/readpackets.hs
diff --git a/src/Control/TriadCommittee.hs b/dht/src/Control/TriadCommittee.hs
index 88e665b6..88e665b6 100644
--- a/src/Control/TriadCommittee.hs
+++ b/dht/src/Control/TriadCommittee.hs
diff --git a/src/Crypto/Nonce.hs b/dht/src/Crypto/Nonce.hs
index 263f9b0a..263f9b0a 100644
--- a/src/Crypto/Nonce.hs
+++ b/dht/src/Crypto/Nonce.hs
diff --git a/src/Crypto/XEd25519.hs b/dht/src/Crypto/XEd25519.hs
index 372f31a8..372f31a8 100644
--- a/src/Crypto/XEd25519.hs
+++ b/dht/src/Crypto/XEd25519.hs
diff --git a/src/Crypto/XEd25519/FieldElement.hs b/dht/src/Crypto/XEd25519/FieldElement.hs
index 7a916107..7a916107 100644
--- a/src/Crypto/XEd25519/FieldElement.hs
+++ b/dht/src/Crypto/XEd25519/FieldElement.hs
diff --git a/src/DPut.hs b/dht/src/DPut.hs
index 38e532d0..38e532d0 100644
--- a/src/DPut.hs
+++ b/dht/src/DPut.hs
diff --git a/src/Data/BEncode/Pretty.hs b/dht/src/Data/BEncode/Pretty.hs
index 8beb101b..8beb101b 100644
--- a/src/Data/BEncode/Pretty.hs
+++ b/dht/src/Data/BEncode/Pretty.hs
diff --git a/src/Data/Bits/ByteString.hs b/dht/src/Data/Bits/ByteString.hs
index bf0316fd..bf0316fd 100644
--- a/src/Data/Bits/ByteString.hs
+++ b/dht/src/Data/Bits/ByteString.hs
diff --git a/src/Data/Digest/CRC32C.hs b/dht/src/Data/Digest/CRC32C.hs
index 18c1314f..18c1314f 100644
--- a/src/Data/Digest/CRC32C.hs
+++ b/dht/src/Data/Digest/CRC32C.hs
diff --git a/src/Data/IntervalSet.hs b/dht/src/Data/IntervalSet.hs
index f1205274..f1205274 100644
--- a/src/Data/IntervalSet.hs
+++ b/dht/src/Data/IntervalSet.hs
diff --git a/src/Data/PacketBuffer.hs b/dht/src/Data/PacketBuffer.hs
index 17745664..17745664 100644
--- a/src/Data/PacketBuffer.hs
+++ b/dht/src/Data/PacketBuffer.hs
diff --git a/src/Data/PacketQueue.hs b/dht/src/Data/PacketQueue.hs
index 15a3b436..15a3b436 100644
--- a/src/Data/PacketQueue.hs
+++ b/dht/src/Data/PacketQueue.hs
diff --git a/src/Data/Sized.hs b/dht/src/Data/Sized.hs
index 0d3d5845..0d3d5845 100644
--- a/src/Data/Sized.hs
+++ b/dht/src/Data/Sized.hs
diff --git a/src/Data/TableMethods.hs b/dht/src/Data/TableMethods.hs
index e4208a69..e4208a69 100644
--- a/src/Data/TableMethods.hs
+++ b/dht/src/Data/TableMethods.hs
diff --git a/src/Data/Torrent.hs b/dht/src/Data/Torrent.hs
index 32c709be..32c709be 100644
--- a/src/Data/Torrent.hs
+++ b/dht/src/Data/Torrent.hs
diff --git a/src/Data/Tox/Message.hs b/dht/src/Data/Tox/Message.hs
index 9f1ce339..9f1ce339 100644
--- a/src/Data/Tox/Message.hs
+++ b/dht/src/Data/Tox/Message.hs
diff --git a/src/Data/Tox/Msg.hs b/dht/src/Data/Tox/Msg.hs
index 66ec6eb1..66ec6eb1 100644
--- a/src/Data/Tox/Msg.hs
+++ b/dht/src/Data/Tox/Msg.hs
diff --git a/src/Data/Tox/Onion.hs b/dht/src/Data/Tox/Onion.hs
index bd802c75..bd802c75 100644
--- a/src/Data/Tox/Onion.hs
+++ b/dht/src/Data/Tox/Onion.hs
diff --git a/src/Data/Tox/Relay.hs b/dht/src/Data/Tox/Relay.hs
index c563db8d..c563db8d 100644
--- a/src/Data/Tox/Relay.hs
+++ b/dht/src/Data/Tox/Relay.hs
diff --git a/src/DebugTag.hs b/dht/src/DebugTag.hs
index 9ac04bb0..9ac04bb0 100644
--- a/src/DebugTag.hs
+++ b/dht/src/DebugTag.hs
diff --git a/src/DebugUtil.hs b/dht/src/DebugUtil.hs
index e7a10397..e7a10397 100644
--- a/src/DebugUtil.hs
+++ b/dht/src/DebugUtil.hs
diff --git a/src/Hans/Checksum.hs b/dht/src/Hans/Checksum.hs
index 7afc93c7..7afc93c7 100644
--- a/src/Hans/Checksum.hs
+++ b/dht/src/Hans/Checksum.hs
diff --git a/src/Network/BitTorrent/DHT/ContactInfo.hs b/dht/src/Network/BitTorrent/DHT/ContactInfo.hs
index ec7e6658..ec7e6658 100644
--- a/src/Network/BitTorrent/DHT/ContactInfo.hs
+++ b/dht/src/Network/BitTorrent/DHT/ContactInfo.hs
diff --git a/src/Network/BitTorrent/DHT/Readme.md b/dht/src/Network/BitTorrent/DHT/Readme.md
index e2352f10..e2352f10 100644
--- a/src/Network/BitTorrent/DHT/Readme.md
+++ b/dht/src/Network/BitTorrent/DHT/Readme.md
diff --git a/src/Network/BitTorrent/DHT/Token.hs b/dht/src/Network/BitTorrent/DHT/Token.hs
index 171cc8be..171cc8be 100644
--- a/src/Network/BitTorrent/DHT/Token.hs
+++ b/dht/src/Network/BitTorrent/DHT/Token.hs
diff --git a/src/Network/BitTorrent/MainlineDHT.hs b/dht/src/Network/BitTorrent/MainlineDHT.hs
index 89851e88..89851e88 100644
--- a/src/Network/BitTorrent/MainlineDHT.hs
+++ b/dht/src/Network/BitTorrent/MainlineDHT.hs
diff --git a/src/Network/BitTorrent/MainlineDHT/Symbols.hs b/dht/src/Network/BitTorrent/MainlineDHT/Symbols.hs
index 05a64014..05a64014 100644
--- a/src/Network/BitTorrent/MainlineDHT/Symbols.hs
+++ b/dht/src/Network/BitTorrent/MainlineDHT/Symbols.hs
diff --git a/src/Network/Lossless.hs b/dht/src/Network/Lossless.hs
index 861792ab..861792ab 100644
--- a/src/Network/Lossless.hs
+++ b/dht/src/Network/Lossless.hs
diff --git a/src/Network/QueryResponse.hs b/dht/src/Network/QueryResponse.hs
index c4ff50e3..c4ff50e3 100644
--- a/src/Network/QueryResponse.hs
+++ b/dht/src/Network/QueryResponse.hs
diff --git a/src/Network/QueryResponse/TCP.hs b/dht/src/Network/QueryResponse/TCP.hs
index bad61727..bad61727 100644
--- a/src/Network/QueryResponse/TCP.hs
+++ b/dht/src/Network/QueryResponse/TCP.hs
diff --git a/src/Network/SessionTransports.hs b/dht/src/Network/SessionTransports.hs
index e9daf6c1..e9daf6c1 100644
--- a/src/Network/SessionTransports.hs
+++ b/dht/src/Network/SessionTransports.hs
diff --git a/src/Network/SocketLike.hs b/dht/src/Network/SocketLike.hs
index d533dd7f..d533dd7f 100644
--- a/src/Network/SocketLike.hs
+++ b/dht/src/Network/SocketLike.hs
diff --git a/src/Network/StreamServer.hs b/dht/src/Network/StreamServer.hs
index 80ed4ee2..80ed4ee2 100644
--- a/src/Network/StreamServer.hs
+++ b/dht/src/Network/StreamServer.hs
diff --git a/src/Network/Tox.hs b/dht/src/Network/Tox.hs
index 98c03b80..98c03b80 100644
--- a/src/Network/Tox.hs
+++ b/dht/src/Network/Tox.hs
diff --git a/src/Network/Tox/AggregateSession.hs b/dht/src/Network/Tox/AggregateSession.hs
index 8c728660..8c728660 100644
--- a/src/Network/Tox/AggregateSession.hs
+++ b/dht/src/Network/Tox/AggregateSession.hs
diff --git a/src/Network/Tox/Avahi.hs b/dht/src/Network/Tox/Avahi.hs
index 635ba656..635ba656 100644
--- a/src/Network/Tox/Avahi.hs
+++ b/dht/src/Network/Tox/Avahi.hs
diff --git a/src/Network/Tox/ContactInfo.hs b/dht/src/Network/Tox/ContactInfo.hs
index e7cb48c1..e7cb48c1 100644
--- a/src/Network/Tox/ContactInfo.hs
+++ b/dht/src/Network/Tox/ContactInfo.hs
diff --git a/src/Network/Tox/Crypto/Transport.hs b/dht/src/Network/Tox/Crypto/Transport.hs
index a18b550d..a18b550d 100644
--- a/src/Network/Tox/Crypto/Transport.hs
+++ b/dht/src/Network/Tox/Crypto/Transport.hs
diff --git a/src/Network/Tox/DHT/Handlers.hs b/dht/src/Network/Tox/DHT/Handlers.hs
index 1eec93b9..1eec93b9 100644
--- a/src/Network/Tox/DHT/Handlers.hs
+++ b/dht/src/Network/Tox/DHT/Handlers.hs
diff --git a/src/Network/Tox/DHT/Transport.hs b/dht/src/Network/Tox/DHT/Transport.hs
index b9b63165..b9b63165 100644
--- a/src/Network/Tox/DHT/Transport.hs
+++ b/dht/src/Network/Tox/DHT/Transport.hs
diff --git a/src/Network/Tox/Handshake.hs b/dht/src/Network/Tox/Handshake.hs
index c48b7415..c48b7415 100644
--- a/src/Network/Tox/Handshake.hs
+++ b/dht/src/Network/Tox/Handshake.hs
diff --git a/src/Network/Tox/NodeId.hs b/dht/src/Network/Tox/NodeId.hs
index 9a9c893a..9a9c893a 100644
--- a/src/Network/Tox/NodeId.hs
+++ b/dht/src/Network/Tox/NodeId.hs
diff --git a/src/Network/Tox/Onion/Handlers.hs b/dht/src/Network/Tox/Onion/Handlers.hs
index f44dd79c..f44dd79c 100644
--- a/src/Network/Tox/Onion/Handlers.hs
+++ b/dht/src/Network/Tox/Onion/Handlers.hs
diff --git a/src/Network/Tox/Onion/Transport.hs b/dht/src/Network/Tox/Onion/Transport.hs
index e746c414..e746c414 100644
--- a/src/Network/Tox/Onion/Transport.hs
+++ b/dht/src/Network/Tox/Onion/Transport.hs
diff --git a/src/Network/Tox/Relay.hs b/dht/src/Network/Tox/Relay.hs
index 2842fcc2..2842fcc2 100644
--- a/src/Network/Tox/Relay.hs
+++ b/dht/src/Network/Tox/Relay.hs
diff --git a/src/Network/Tox/Session.hs b/dht/src/Network/Tox/Session.hs
index 189967fa..189967fa 100644
--- a/src/Network/Tox/Session.hs
+++ b/dht/src/Network/Tox/Session.hs
diff --git a/src/Network/Tox/TCP.hs b/dht/src/Network/Tox/TCP.hs
index 13da804f..13da804f 100644
--- a/src/Network/Tox/TCP.hs
+++ b/dht/src/Network/Tox/TCP.hs
diff --git a/src/Network/Tox/Transport.hs b/dht/src/Network/Tox/Transport.hs
index 217d5b1d..217d5b1d 100644
--- a/src/Network/Tox/Transport.hs
+++ b/dht/src/Network/Tox/Transport.hs
diff --git a/src/Network/UPNP.hs b/dht/src/Network/UPNP.hs
index 01d222bf..01d222bf 100644
--- a/src/Network/UPNP.hs
+++ b/dht/src/Network/UPNP.hs
diff --git a/src/StaticAssert.hs b/dht/src/StaticAssert.hs
index d0784c97..d0784c97 100644
--- a/src/StaticAssert.hs
+++ b/dht/src/StaticAssert.hs
diff --git a/src/System/Global6.hs b/dht/src/System/Global6.hs
index 38a90a59..38a90a59 100644
--- a/src/System/Global6.hs
+++ b/dht/src/System/Global6.hs
diff --git a/src/Text/XXD.hs b/dht/src/Text/XXD.hs
index 77606bfa..77606bfa 100644
--- a/src/Text/XXD.hs
+++ b/dht/src/Text/XXD.hs
diff --git a/stack.yaml b/dht/stack.yaml
index 1927a573..1927a573 100644
--- a/stack.yaml
+++ b/dht/stack.yaml
diff --git a/t b/dht/t
index 22b21361..22b21361 100755
--- a/t
+++ b/dht/t
diff --git a/todo.txt b/dht/todo.txt
index 12227a71..12227a71 100644
--- a/todo.txt
+++ b/dht/todo.txt
diff --git a/vnet/build.sh b/dht/vnet/build.sh
index 5354969a..5354969a 100755
--- a/vnet/build.sh
+++ b/dht/vnet/build.sh
diff --git a/vnet/clean.sh b/dht/vnet/clean.sh
index 3e0af1bd..3e0af1bd 100755
--- a/vnet/clean.sh
+++ b/dht/vnet/clean.sh
diff --git a/vnet/everywhere.sh b/dht/vnet/everywhere.sh
index ebd4ca38..ebd4ca38 100755
--- a/vnet/everywhere.sh
+++ b/dht/vnet/everywhere.sh
diff --git a/vnet/mkroutes.sh b/dht/vnet/mkroutes.sh
index 8b13faaa..8b13faaa 100755
--- a/vnet/mkroutes.sh
+++ b/dht/vnet/mkroutes.sh
diff --git a/vnet/run.sh b/dht/vnet/run.sh
index 0189b6b7..0189b6b7 100755
--- a/vnet/run.sh
+++ b/dht/vnet/run.sh
diff --git a/vnet/screen-everywhere.sh b/dht/vnet/screen-everywhere.sh
index e4f75374..e4f75374 100755
--- a/vnet/screen-everywhere.sh
+++ b/dht/vnet/screen-everywhere.sh
diff --git a/vnet/screen-shell.sh b/dht/vnet/screen-shell.sh
index fa420b9d..fa420b9d 100755
--- a/vnet/screen-shell.sh
+++ b/dht/vnet/screen-shell.sh
diff --git a/vnet/show-links.sh b/dht/vnet/show-links.sh
index d7115a0b..d7115a0b 100755
--- a/vnet/show-links.sh
+++ b/dht/vnet/show-links.sh
diff --git a/dput-hslogger/CHANGELOG.md b/dput-hslogger/CHANGELOG.md
new file mode 100644
index 00000000..8626ce35
--- /dev/null
+++ b/dput-hslogger/CHANGELOG.md
@@ -0,0 +1,5 @@
+# Revision history for dput-hslogger
+
+## 0.1.0.0 -- YYYY-mm-dd
+
+* First version. Released on an unsuspecting world.
diff --git a/dput-hslogger/LICENSE b/dput-hslogger/LICENSE
new file mode 100644
index 00000000..a97490ef
--- /dev/null
+++ b/dput-hslogger/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2018, James Crayne
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of James Crayne nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/dput-hslogger/Setup.hs b/dput-hslogger/Setup.hs
new file mode 100644
index 00000000..9a994af6
--- /dev/null
+++ b/dput-hslogger/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/dput-hslogger/dput-hslogger.cabal b/dput-hslogger/dput-hslogger.cabal
new file mode 100644
index 00000000..0ddb75ba
--- /dev/null
+++ b/dput-hslogger/dput-hslogger.cabal
@@ -0,0 +1,24 @@
+-- Initial dput-hslogger.cabal generated by cabal init.  For further
+-- documentation, see http://haskell.org/cabal/users-guide/
+
+name:                dput-hslogger
+version:             0.1.0.0
+synopsis:            Quick and dirty debug prints indexed by user Enum type.
+-- description:
+license:             BSD3
+license-file:        LICENSE
+author:              James Crayne
+maintainer:          jim.crayne@gmail.com
+-- copyright:
+category:            Development
+build-type:          Simple
+extra-source-files:  CHANGELOG.md
+cabal-version:       >=1.10
+
+library
+  exposed-modules:     DPut
+  -- other-modules:
+  other-extensions:    ConstraintKinds, ScopedTypeVariables
+  build-depends:       base -any, containers -any, bytestring -any, text -any, hslogger -any
+  hs-source-dirs:      src
+  default-language:    Haskell2010
diff --git a/dput-hslogger/src/DPut.hs b/dput-hslogger/src/DPut.hs
new file mode 100644
index 00000000..38e532d0
--- /dev/null
+++ b/dput-hslogger/src/DPut.hs
@@ -0,0 +1,75 @@
+{-# LANGUAGE ConstraintKinds #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+module DPut where
+
+import Control.Monad.IO.Class
+import qualified Data.Map.Strict as Map
+import Data.Maybe
+import Data.IORef
+import System.IO.Unsafe (unsafePerformIO)
+import System.Log.Logger
+import qualified Data.ByteString.Char8 as B
+import qualified Data.Text as T
+import qualified Data.Text.Encoding as T
+import Debug.Trace
+import Data.Typeable
+import Data.Dynamic
+
+type IsDebugTag t = (Eq t, Ord t, Show t, Read t, Enum t, Bounded t,Typeable t)
+
+appName :: String
+appName = "toxmpp"
+
+(<.>) :: String -> String -> String
+a <.> b = a ++ "." ++ b
+
+dput :: (MonadIO m, IsDebugTag tag) => tag -> String -> m ()
+dput tag msg = liftIO $ debugM (appName <.> show tag) msg
+
+dputB :: (MonadIO m, IsDebugTag tag) => tag -> B.ByteString -> m ()
+dputB tag msg = liftIO $ debugM (appName <.> show tag) (T.unpack . T.decodeUtf8 $ msg)
+
+{-# NOINLINE verbosityMap #-}
+verbosityMap :: IORef (Map.Map TypeRep Dynamic)
+verbosityMap = unsafePerformIO $ newIORef (Map.empty)
+
+-- | Trace version of 'dput' works in arbitrary monad, using unsafePerformIO.
+tput :: (Applicative m, IsDebugTag tag) => tag -> String -> m ()
+tput tag msg =
+  let mp = unsafePerformIO $ readIORef verbosityMap
+    in if maybe True (fromMaybe True . Map.lookup tag . flip fromDyn Map.empty) (Map.lookup (typeOf tag) mp)
+        then trace msg (pure ())
+        else pure ()
+
+-- | like 'trace' but parameterized with 'DebugTag'
+dtrace :: forall a tag. IsDebugTag tag =>  tag -> String -> a -> a
+dtrace tag msg result = let mp = unsafePerformIO $ readIORef verbosityMap
+                            mp' :: Map.Map tag Bool
+                            mp' = maybe Map.empty (flip fromDyn Map.empty) (Map.lookup (typeOf tag) mp)
+                            in if fromMaybe True (Map.lookup tag mp')
+                                then trace msg result
+                                else result
+
+setTagLevel :: forall tag. IsDebugTag tag => Priority -> tag -> IO ()
+setTagLevel level tag = do
+    updateGlobalLogger (appName <.> show tag) (setLevel level)
+    modifyIORef verbosityMap $ \mpByType -> do
+        case Map.lookup (typeOf tag) mpByType of
+            Nothing -> Map.insert (typeOf tag) (toDyn $ Map.fromList [(tag,(level <= DEBUG))]) mpByType
+            Just dyn -> let mpByTag :: Map.Map tag Bool
+                            mpByTag = fromDyn dyn Map.empty 
+                            in Map.insert (typeOf tag) (toDyn $ Map.insert tag (level <= DEBUG) mpByTag) mpByType
+
+setQuiet :: forall tag. IsDebugTag tag => tag -> IO ()
+setQuiet = setTagLevel WARNING
+
+setVerbose :: forall tag. IsDebugTag tag => tag -> IO ()
+setVerbose = setTagLevel DEBUG
+
+getVerbose :: forall tag. IsDebugTag tag => tag -> IO Bool
+getVerbose tag = do
+    logger <- getLogger (appName <.> show tag)
+    case getLevel logger of
+        Just p | p <= DEBUG -> return True
+        _ -> return False
+
diff --git a/kad/CHANGELOG.md b/kad/CHANGELOG.md
new file mode 100644
index 00000000..6255a362
--- /dev/null
+++ b/kad/CHANGELOG.md
@@ -0,0 +1,5 @@
+# Revision history for kad
+
+## 0.1.0.0 -- YYYY-mm-dd
+
+* First version. Released on an unsuspecting world.
diff --git a/kad/LICENSE b/kad/LICENSE
new file mode 100644
index 00000000..e8eaef49
--- /dev/null
+++ b/kad/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2019, James Crayne
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of James Crayne nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/kad/Setup.hs b/kad/Setup.hs
new file mode 100644
index 00000000..9a994af6
--- /dev/null
+++ b/kad/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/kad/kad.cabal b/kad/kad.cabal
new file mode 100644
index 00000000..5babda13
--- /dev/null
+++ b/kad/kad.cabal
@@ -0,0 +1,76 @@
+-- Initial kad.cabal generated by cabal init.  For further documentation,
+-- see http://haskell.org/cabal/users-guide/
+
+name:                kad
+version:             0.1.0.0
+-- synopsis:
+-- description:
+license:             BSD3
+license-file:        LICENSE
+author:              James Crayne
+maintainer:          jim.crayne@gmail.com
+-- copyright:
+-- category:
+build-type:          Simple
+extra-source-files:  CHANGELOG.md
+cabal-version:       >=1.10
+
+library
+  cpp-options: -DTHREAD_DEBUG
+  exposed-modules:
+          Network.Kademlia
+        , Network.Kademlia.Bootstrap
+        , Network.Kademlia.Routing
+        , Network.Kademlia.CommonAPI
+        , Network.Kademlia.Persistence
+        , Network.Kademlia.Search
+  other-modules: DebugTag
+  other-extensions:
+          CPP
+        , ConstraintKinds
+        , DeriveFunctor
+        , DeriveTraversable
+        , FlexibleContexts
+        , GADTs
+        , KindSignatures
+        , LambdaCase
+        , NamedFieldPuns
+        , PartialTypeSignatures
+        , PatternSynonyms
+        , RankNTypes
+        , ScopedTypeVariables
+        , RecordWildCards
+        , BangPatterns
+        , ViewPatterns
+        , TypeOperators
+        , DeriveGeneric
+        , TupleSections
+        , StandaloneDeriving
+        , MultiParamTypeClasses
+        , FlexibleInstances
+        , ExistentialQuantification
+  build-depends:
+          base
+        , tox-crypto
+        , entropy
+        , lifted-base
+        , lifted-concurrent
+        , aeson
+        , vector
+        , containers
+        , unordered-containers
+        , dput-hslogger
+        , time
+        , stm
+        , pretty
+        , bytestring
+        , hashable
+        , contravariant
+        , reflection
+        , psq-wrap
+        , minmax-psq
+        , network-addr
+        , cereal
+        , tasks
+  hs-source-dirs:      src
+  default-language:    Haskell2010
diff --git a/kad/src/DebugTag.hs b/kad/src/DebugTag.hs
new file mode 100644
index 00000000..9ac04bb0
--- /dev/null
+++ b/kad/src/DebugTag.hs
@@ -0,0 +1,24 @@
+module DebugTag where
+
+import Data.Typeable
+
+-- | Debug Tags, add more as needed, but ensure XAnnounce is always first, XMisc last
+data DebugTag
+  = XAnnounce
+  | XBitTorrent
+  | XDHT
+  | XLan
+  | XMan
+  | XNetCrypto
+  | XNetCryptoOut
+  | XOnion
+  | XRoutes
+  | XPing
+  | XRefresh
+  | XJabber
+  | XTCP
+  | XMisc
+  | XNodeinfoSearch
+  | XUnexpected -- Used only for special anomalous errors that we didn't expect to happen.
+  | XUnused     -- Never commit code that uses XUnused.
+  deriving (Eq, Ord, Show, Read, Enum, Bounded,Typeable)
diff --git a/src/Network/Kademlia.hs b/kad/src/Network/Kademlia.hs
index e61afe9b..e61afe9b 100644
--- a/src/Network/Kademlia.hs
+++ b/kad/src/Network/Kademlia.hs
diff --git a/src/Network/Kademlia/Bootstrap.hs b/kad/src/Network/Kademlia/Bootstrap.hs
index 1324ae77..08ba3318 100644
--- a/src/Network/Kademlia/Bootstrap.hs
+++ b/kad/src/Network/Kademlia/Bootstrap.hs
@@ -7,6 +7,8 @@
 {-# LANGUAGE KindSignatures        #-}
 {-# LANGUAGE LambdaCase            #-}
 {-# LANGUAGE NamedFieldPuns        #-}
+{-# LANGUAGE RecordWildCards       #-}
+{-# LANGUAGE NondecreasingIndentation #-}
 {-# LANGUAGE PartialTypeSignatures #-}
 {-# LANGUAGE PatternSynonyms       #-}
 {-# LANGUAGE RankNTypes            #-}
diff --git a/src/Network/Kademlia/CommonAPI.hs b/kad/src/Network/Kademlia/CommonAPI.hs
index 601be5d8..601be5d8 100644
--- a/src/Network/Kademlia/CommonAPI.hs
+++ b/kad/src/Network/Kademlia/CommonAPI.hs
diff --git a/src/Network/Kademlia/Persistence.hs b/kad/src/Network/Kademlia/Persistence.hs
index d7431671..32ec169d 100644
--- a/src/Network/Kademlia/Persistence.hs
+++ b/kad/src/Network/Kademlia/Persistence.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE NamedFieldPuns            #-}
+{-# LANGUAGE OverloadedStrings         #-}
 module Network.Kademlia.Persistence where
 
 import Network.Kademlia.CommonAPI
diff --git a/src/Network/Kademlia/Routing.hs b/kad/src/Network/Kademlia/Routing.hs
index a52cca73..c7fdf028 100644
--- a/src/Network/Kademlia/Routing.hs
+++ b/kad/src/Network/Kademlia/Routing.hs
@@ -25,6 +25,7 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE StandaloneDeriving, FlexibleContexts, MultiParamTypeClasses, FlexibleInstances #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Network.Kademlia.Routing
diff --git a/src/Network/Kademlia/Search.hs b/kad/src/Network/Kademlia/Search.hs
index 1be1afc1..1be1afc1 100644
--- a/src/Network/Kademlia/Search.hs
+++ b/kad/src/Network/Kademlia/Search.hs
diff --git a/lifted-concurrent/CHANGELOG.md b/lifted-concurrent/CHANGELOG.md
new file mode 100644
index 00000000..3915e1ca
--- /dev/null
+++ b/lifted-concurrent/CHANGELOG.md
@@ -0,0 +1,5 @@
+# Revision history for lifted-concurrent
+
+## 0.1.0.0 -- YYYY-mm-dd
+
+* First version. Released on an unsuspecting world.
diff --git a/lifted-concurrent/LICENSE b/lifted-concurrent/LICENSE
new file mode 100644
index 00000000..e8eaef49
--- /dev/null
+++ b/lifted-concurrent/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2019, James Crayne
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of James Crayne nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/lifted-concurrent/Setup.hs b/lifted-concurrent/Setup.hs
new file mode 100644
index 00000000..9a994af6
--- /dev/null
+++ b/lifted-concurrent/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/lifted-concurrent/lifted-concurrent.cabal b/lifted-concurrent/lifted-concurrent.cabal
new file mode 100644
index 00000000..3d8acba7
--- /dev/null
+++ b/lifted-concurrent/lifted-concurrent.cabal
@@ -0,0 +1,34 @@
+-- Initial lifted-concurrent.cabal generated by cabal init.  For further
+-- documentation, see http://haskell.org/cabal/users-guide/
+
+name:                lifted-concurrent
+version:             0.1.0.0
+-- synopsis:
+-- description:
+license:             BSD3
+license-file:        LICENSE
+author:              James Crayne
+maintainer:          jim.crayne@gmail.com
+-- copyright:
+-- category:
+build-type:          Simple
+extra-source-files:  CHANGELOG.md
+cabal-version:       >=1.10
+
+library
+  exposed-modules:
+          Control.Concurrent.Lifted.Instrument
+        , Control.Concurrent.Async.Lifted.Instrument
+  other-modules: DebugTag
+  other-extensions:    FlexibleContexts
+  build-depends:
+          base
+        , containers
+        , time
+        , lifted-async
+        , dput-hslogger
+        , lifted-base
+        , monad-control
+        , transformers-base
+  hs-source-dirs:      src
+  default-language:    Haskell2010
diff --git a/src/Control/Concurrent/Async/Lifted/Instrument.hs b/lifted-concurrent/src/Control/Concurrent/Async/Lifted/Instrument.hs
index eab0fadc..eab0fadc 100644
--- a/src/Control/Concurrent/Async/Lifted/Instrument.hs
+++ b/lifted-concurrent/src/Control/Concurrent/Async/Lifted/Instrument.hs
diff --git a/src/Control/Concurrent/Lifted/Instrument.hs b/lifted-concurrent/src/Control/Concurrent/Lifted/Instrument.hs
index fc3b6369..fc3b6369 100644
--- a/src/Control/Concurrent/Lifted/Instrument.hs
+++ b/lifted-concurrent/src/Control/Concurrent/Lifted/Instrument.hs
diff --git a/lifted-concurrent/src/DebugTag.hs b/lifted-concurrent/src/DebugTag.hs
new file mode 100644
index 00000000..9ac04bb0
--- /dev/null
+++ b/lifted-concurrent/src/DebugTag.hs
@@ -0,0 +1,24 @@
+module DebugTag where
+
+import Data.Typeable
+
+-- | Debug Tags, add more as needed, but ensure XAnnounce is always first, XMisc last
+data DebugTag
+  = XAnnounce
+  | XBitTorrent
+  | XDHT
+  | XLan
+  | XMan
+  | XNetCrypto
+  | XNetCryptoOut
+  | XOnion
+  | XRoutes
+  | XPing
+  | XRefresh
+  | XJabber
+  | XTCP
+  | XMisc
+  | XNodeinfoSearch
+  | XUnexpected -- Used only for special anomalous errors that we didn't expect to happen.
+  | XUnused     -- Never commit code that uses XUnused.
+  deriving (Eq, Ord, Show, Read, Enum, Bounded,Typeable)
diff --git a/minmax-psq/CHANGELOG.md b/minmax-psq/CHANGELOG.md
new file mode 100644
index 00000000..ba7d08da
--- /dev/null
+++ b/minmax-psq/CHANGELOG.md
@@ -0,0 +1,5 @@
+# Revision history for minmax-psq
+
+## 0.1.0.0 -- YYYY-mm-dd
+
+* First version. Released on an unsuspecting world.
diff --git a/minmax-psq/LICENSE b/minmax-psq/LICENSE
new file mode 100644
index 00000000..e8eaef49
--- /dev/null
+++ b/minmax-psq/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2019, James Crayne
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of James Crayne nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/minmax-psq/Setup.hs b/minmax-psq/Setup.hs
new file mode 100644
index 00000000..9a994af6
--- /dev/null
+++ b/minmax-psq/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/minmax-psq/minmax-psq.cabal b/minmax-psq/minmax-psq.cabal
new file mode 100644
index 00000000..ba04bd45
--- /dev/null
+++ b/minmax-psq/minmax-psq.cabal
@@ -0,0 +1,24 @@
+-- Initial minmax-psq.cabal generated by cabal init.  For further
+-- documentation, see http://haskell.org/cabal/users-guide/
+
+name:                minmax-psq
+version:             0.1.0.0
+-- synopsis:
+-- description:
+license:             BSD3
+license-file:        LICENSE
+author:              James Crayne
+maintainer:          jim.crayne@gmail.com
+-- copyright:
+-- category:
+build-type:          Simple
+extra-source-files:  CHANGELOG.md
+cabal-version:       >=1.10
+
+library
+  exposed-modules:     Data.MinMaxPSQ
+  -- other-modules:
+  other-extensions:    BangPatterns, PatternSynonyms
+  build-depends:       base, psq-wrap
+  hs-source-dirs:      src
+  default-language:    Haskell2010
diff --git a/src/Data/MinMaxPSQ.hs b/minmax-psq/src/Data/MinMaxPSQ.hs
index e7d7c760..e7d7c760 100644
--- a/src/Data/MinMaxPSQ.hs
+++ b/minmax-psq/src/Data/MinMaxPSQ.hs
diff --git a/network-addr/CHANGELOG.md b/network-addr/CHANGELOG.md
new file mode 100644
index 00000000..4178ce9e
--- /dev/null
+++ b/network-addr/CHANGELOG.md
@@ -0,0 +1,5 @@
+# Revision history for network-addr
+
+## 0.1.0.0 -- YYYY-mm-dd
+
+* First version. Released on an unsuspecting world.
diff --git a/network-addr/LICENSE b/network-addr/LICENSE
new file mode 100644
index 00000000..e8eaef49
--- /dev/null
+++ b/network-addr/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2019, James Crayne
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of James Crayne nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/network-addr/Setup.hs b/network-addr/Setup.hs
new file mode 100644
index 00000000..9a994af6
--- /dev/null
+++ b/network-addr/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/network-addr/network-addr.cabal b/network-addr/network-addr.cabal
new file mode 100644
index 00000000..59c91cea
--- /dev/null
+++ b/network-addr/network-addr.cabal
@@ -0,0 +1,52 @@
+-- Initial network-addr.cabal generated by cabal init.  For further
+-- documentation, see http://haskell.org/cabal/users-guide/
+
+name:                network-addr
+version:             0.1.0.0
+-- synopsis:
+-- description:
+license:             BSD3
+license-file:        LICENSE
+author:              James Crayne
+maintainer:          jim.crayne@gmail.com
+-- copyright:
+-- category:
+build-type:          Simple
+extra-source-files:  CHANGELOG.md
+cabal-version:       >=1.10
+
+library
+  exposed-modules:     Network.Address
+  other-modules: DebugTag
+  other-extensions:
+          CPP
+        , FlexibleInstances
+        , FlexibleContexts
+        , RecordWildCards
+        , ScopedTypeVariables
+        , StandaloneDeriving
+        , ViewPatterns
+        , GeneralizedNewtypeDeriving
+        , MultiParamTypeClasses
+        , DeriveDataTypeable
+        , DeriveFunctor
+        , DeriveFoldable
+        , DeriveTraversable
+        , TemplateHaskell
+        , OverloadedStrings
+  build-depends:
+          base
+        , bytestring
+        , time
+        , pretty
+        , iproute
+        , network
+        , dput-hslogger
+        , hashable
+        , cereal
+        , data-default
+        , convertible
+        , entropy
+        , http-types
+  hs-source-dirs:      src
+  default-language:    Haskell2010
diff --git a/network-addr/src/DebugTag.hs b/network-addr/src/DebugTag.hs
new file mode 100644
index 00000000..9ac04bb0
--- /dev/null
+++ b/network-addr/src/DebugTag.hs
@@ -0,0 +1,24 @@
+module DebugTag where
+
+import Data.Typeable
+
+-- | Debug Tags, add more as needed, but ensure XAnnounce is always first, XMisc last
+data DebugTag
+  = XAnnounce
+  | XBitTorrent
+  | XDHT
+  | XLan
+  | XMan
+  | XNetCrypto
+  | XNetCryptoOut
+  | XOnion
+  | XRoutes
+  | XPing
+  | XRefresh
+  | XJabber
+  | XTCP
+  | XMisc
+  | XNodeinfoSearch
+  | XUnexpected -- Used only for special anomalous errors that we didn't expect to happen.
+  | XUnused     -- Never commit code that uses XUnused.
+  deriving (Eq, Ord, Show, Read, Enum, Bounded,Typeable)
diff --git a/src/Network/Address.hs b/network-addr/src/Network/Address.hs
index e1cec34d..369ae864 100644
--- a/src/Network/Address.hs
+++ b/network-addr/src/Network/Address.hs
@@ -23,6 +23,7 @@
 {-# LANGUAGE DeriveFoldable             #-}
 {-# LANGUAGE DeriveTraversable          #-}
 {-# LANGUAGE TemplateHaskell            #-}
+{-# LANGUAGE OverloadedStrings          #-}
 {-# OPTIONS -fno-warn-orphans           #-}
 module Network.Address
        ( -- * Address
@@ -1184,8 +1185,6 @@ fingerprint pid = either (const def) id $ runGet getCI (getPeerId pid)
       str <- BC.unpack <$> getByteString 5
       return $ Version (catMaybes $ L.map decodeShadowVerNr str) []
 
-
-
 -- | Given a string specifying a port (numeric or service name)
 -- and a flag indicating whether you want to support IPv6, this
 -- function will return a SockAddr to bind to.  If the input
@@ -1208,8 +1207,8 @@ getBindAddress bindspec enabled6 = do
           case if enabled6 then x6s++x4s else x4s of
             AddrInfo { addrAddress = addr } : _ -> addr
             _ -> if enabled6
-                  then SockAddrInet6 (parsePort listenPortString) 0 iN6ADDR_ANY 0
-                  else SockAddrInet (parsePort listenPortString) iNADDR_ANY
+                  then SockAddrInet6 (parsePort listenPortString) 0 (0,0,0,0){-iN6ADDR_ANY-} 0
+                  else SockAddrInet (parsePort listenPortString) 0{-iNADDR_ANY-}
                     where parsePort s = fromMaybe 0 $ readMaybe s
     dput XMisc $ "Listening on " ++ show listenAddr
     return listenAddr
diff --git a/psq-wrap/CHANGELOG.md b/psq-wrap/CHANGELOG.md
new file mode 100644
index 00000000..a2e49e7a
--- /dev/null
+++ b/psq-wrap/CHANGELOG.md
@@ -0,0 +1,5 @@
+# Revision history for psq-wrap
+
+## 0.1.0.0 -- YYYY-mm-dd
+
+* First version. Released on an unsuspecting world.
diff --git a/psq-wrap/LICENSE b/psq-wrap/LICENSE
new file mode 100644
index 00000000..e8eaef49
--- /dev/null
+++ b/psq-wrap/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2019, James Crayne
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of James Crayne nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/psq-wrap/Setup.hs b/psq-wrap/Setup.hs
new file mode 100644
index 00000000..9a994af6
--- /dev/null
+++ b/psq-wrap/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/psq-wrap/psq-wrap.cabal b/psq-wrap/psq-wrap.cabal
new file mode 100644
index 00000000..77a7901b
--- /dev/null
+++ b/psq-wrap/psq-wrap.cabal
@@ -0,0 +1,30 @@
+-- Initial psq-wrap.cabal generated by cabal init.  For further
+-- documentation, see http://haskell.org/cabal/users-guide/
+
+name:                psq-wrap
+version:             0.1.0.0
+-- synopsis:
+-- description:
+license:             BSD3
+license-file:        LICENSE
+author:              James Crayne
+maintainer:          jim.crayne@gmail.com
+-- copyright:
+-- category:
+build-type:          Simple
+extra-source-files:  CHANGELOG.md
+cabal-version:       >=1.10
+
+library
+  exposed-modules:
+          Data.Wrapper.PSQInt
+        , Data.Wrapper.PSQ
+  -- other-modules:
+  other-extensions:    PatternSynonyms, CPP, ConstraintKinds
+  build-depends:
+          base
+        , time
+        , hashable
+        , psqueues
+  hs-source-dirs:      src
+  default-language:    Haskell2010
diff --git a/src/Data/Wrapper/PSQ.hs b/psq-wrap/src/Data/Wrapper/PSQ.hs
index 4fdeec67..4fdeec67 100644
--- a/src/Data/Wrapper/PSQ.hs
+++ b/psq-wrap/src/Data/Wrapper/PSQ.hs
diff --git a/src/Data/Wrapper/PSQInt.hs b/psq-wrap/src/Data/Wrapper/PSQInt.hs
index 5badb8b2..5badb8b2 100644
--- a/src/Data/Wrapper/PSQInt.hs
+++ b/psq-wrap/src/Data/Wrapper/PSQInt.hs
diff --git a/sensible-directory/Setup.hs b/sensible-directory/Setup.hs
new file mode 100644
index 00000000..9a994af6
--- /dev/null
+++ b/sensible-directory/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/sensible-directory/sensible-directory.cabal b/sensible-directory/sensible-directory.cabal
new file mode 100644
index 00000000..13929c05
--- /dev/null
+++ b/sensible-directory/sensible-directory.cabal
@@ -0,0 +1,30 @@
+name:                sensible-directory
+version:             0.1.0.0
+-- synopsis:            
+description:         Try to guess the appropriate cache directory.
+license:             BSD3
+license-file:        LICENSE
+author:              James Crayne
+maintainer:          jim.crayne@gmail.com
+-- copyright:           
+-- category:            
+build-type:          Custom
+-- extra-source-files:  
+cabal-version:       >=1.10
+
+Flag dirxdg
+  description: compat layer for old directory package
+  default: False
+
+library
+  exposed-modules:     SensibleDir
+  -- other-modules:       
+  -- other-extensions:    
+  build-depends:       base, filepath
+  if flag(dirxdg) || impl(ghc < 8)
+    build-depends:     directory >= 1.2.2, directory-xdg
+  else
+    build-depends:     directory >= 1.2.3
+  hs-source-dirs:      src
+  default-language:    Haskell2010
+
diff --git a/sensible-directory/src/SensibleDir.hs b/sensible-directory/src/SensibleDir.hs
new file mode 100644
index 00000000..c5f9ae1f
--- /dev/null
+++ b/sensible-directory/src/SensibleDir.hs
@@ -0,0 +1,121 @@
+{-# LANGUAGE CPP #-}
+{-# LANGUAGE TupleSections #-}
+module SensibleDir where
+
+import Paths_testcabaldir
+import System.Directory
+#ifdef VERSION_directory_xdg
+import System.DirectoryXdg
+#endif
+import System.FilePath
+import System.IO
+import System.Info
+import System.Environment
+import Control.Arrow
+import Control.Applicative
+import Data.List
+
+installScenario = NotInstalled
+doit = do
+    ddir <- getDataDir
+    ldir <- getLibDir
+    pname <- getProgName
+    ppath <- getExecutablePath
+    sysconfdir <- getSysconfDir
+    putStrLn ("ddir = " ++ ddir);
+    putStrLn ("ldir = " ++ ldir);
+    putStrLn ("sysconfdir = " ++ sysconfdir);
+    putStrLn ("pname = " ++ pname);
+    putStr "runningInBuildDir = "
+    print =<< runningInBuildDir
+    putStr "detectLikelyInstall = "
+    print =<< detectLikelyInstall
+    putStrLn "---------------------"
+    putStr "sensibleCacheDir = "
+    print =<< sensibleCacheDir pname
+    -- putStr "sensibleConfigDir = "
+    -- print =<< sensibleConfigDir pname
+
+runningInBuildDir :: IO Bool
+runningInBuildDir = any (=="build") . take 2 . reverse . splitDirectories . takeDirectory <$> getExecutablePath
+    
+runningInCabalDir :: IO Bool
+runningInCabalDir = any (==".cabal") . take 2 . reverse . splitDirectories . takeDirectory <$> getExecutablePath
+
+runningInSysBin = do
+    exedir <- splitDirectories . takeDirectory <$> getExecutablePath
+    return $ 
+      case take 3 (drop 1 exedir) of
+        ["bin"]                -> True
+        ["sbin"]               -> True
+        ["usr","bin"]          -> True
+        ["usr","sbin"]         -> True
+        _ -> False
+
+runningInLocalBin = do
+    exedir <- splitDirectories . takeDirectory <$> getExecutablePath
+    putStr "exedir = "
+    print exedir
+    return $ 
+      case take 3 (drop 1 exedir) of
+        ["usr","local","bin"]  -> True
+        ["usr","local","sbin"] -> True
+        _ -> False
+
+-- scenarios
+data InstallScenario = PrefixInstall
+                     -- ^ installed in /opt or some other prefix, or running inside source folder
+                     | SystemInstall
+                     -- ^ installed system wide
+                     | LocalInstall
+                     -- ^ installed in /usr/local/
+                     | UserInstall
+                     -- ^ installed for a given user
+                     | NotInstalled
+                     -- ^ not installed, built by cabal or make, running from dist folder
+    deriving (Show,Enum,Eq)
+
+-- | careful, assumes unix-style FHS
+--   windows aware contributions welcome
+--   Detects the likely install scenario based on the path to the exectuable.
+detectLikelyInstall :: IO InstallScenario
+detectLikelyInstall = do
+    bBuildDir <- fmap (,NotInstalled) runningInBuildDir
+    bCabalDir <- fmap (,UserInstall)  runningInCabalDir
+    bLocalDir <- fmap (,LocalInstall) runningInLocalBin
+    bSysDir   <- fmap (,SystemInstall) runningInSysBin
+    case dropWhile (not . fst) [bBuildDir,bCabalDir,bLocalDir,bSysDir] of
+        (True,scenario):_ -> return scenario
+        _                 -> return PrefixInstall
+
+isUnix os = not $ "mingw" `isPrefixOf` os
+
+-- | Try to get the cache directory appropriate to the install scenario.
+--   On windows it just calls getAppUserDataDirectory and appends "cache". 
+--   (windows behavior subject to change, contributions welcome)
+sensibleCacheDir suffix = do
+    let ifunix x = if isUnix os then x
+                                else PrefixInstall
+    install <- ifunix <$> detectLikelyInstall
+    case install of
+        PrefixInstall -> do
+          if isUnix os
+           then do
+            dir <- splitDirectories . takeDirectory <$> getExecutablePath
+            let rdir = reverse dir
+            case take 1 rdir of
+                ["bin"] -> return $ (foldl1 combine $ reverse (drop 1 rdir)) </> "cache" </> suffix
+                _ -> fmap ((</> suffix) . (</> "cache") . takeDirectory) getExecutablePath
+           else getAppUserDataDirectory ("cache" </> suffix)
+        SystemInstall -> return ("/var/cache" </> suffix)
+        LocalInstall  -> return ("/var/local/cache" </> suffix)
+        UserInstall  -> getXdgDirectory XdgCache suffix
+        NotInstalled -> do
+            dir <- splitDirectories . takeDirectory <$> getExecutablePath
+            let rdir = reverse dir
+            return . foldl1 combine $ reverse ("cache": drop 2 rdir)
+
+-- | like 'sensibleCacheDir', but creates it if needed
+sensibleCacheDirCreateIfMissing suffix = do
+    dir <- sensibleCacheDir suffix
+    createDirectoryIfMissing True dir
diff --git a/tasks/CHANGELOG.md b/tasks/CHANGELOG.md
new file mode 100644
index 00000000..1ae925ad
--- /dev/null
+++ b/tasks/CHANGELOG.md
@@ -0,0 +1,5 @@
+# Revision history for tasks
+
+## 0.1.0.0 -- YYYY-mm-dd
+
+* First version. Released on an unsuspecting world.
diff --git a/tasks/LICENSE b/tasks/LICENSE
new file mode 100644
index 00000000..e8eaef49
--- /dev/null
+++ b/tasks/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2019, James Crayne
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of James Crayne nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/tasks/Setup.hs b/tasks/Setup.hs
new file mode 100644
index 00000000..9a994af6
--- /dev/null
+++ b/tasks/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/src/Control/Concurrent/Tasks.hs b/tasks/src/Control/Concurrent/Tasks.hs
index da2e589e..da2e589e 100644
--- a/src/Control/Concurrent/Tasks.hs
+++ b/tasks/src/Control/Concurrent/Tasks.hs
diff --git a/tasks/tasks.cabal b/tasks/tasks.cabal
new file mode 100644
index 00000000..e7ec8d63
--- /dev/null
+++ b/tasks/tasks.cabal
@@ -0,0 +1,29 @@
+-- Initial tasks.cabal generated by cabal init.  For further documentation,
+--  see http://haskell.org/cabal/users-guide/
+
+name:                tasks
+version:             0.1.0.0
+-- synopsis:
+-- description:
+license:             BSD3
+license-file:        LICENSE
+author:              James Crayne
+maintainer:          jim.crayne@gmail.com
+-- copyright:
+-- category:
+build-type:          Simple
+extra-source-files:  CHANGELOG.md
+cabal-version:       >=1.10
+
+library
+  exposed-modules:     Control.Concurrent.Tasks
+  -- other-modules:
+  other-extensions:    CPP
+  build-depends:
+          base
+        , stm
+        , lifted-concurrent
+        , lifted-base
+  cpp-options: -DTHREAD_DEBUG
+  hs-source-dirs:      src
+  default-language:    Haskell2010
diff --git a/tox-crypto/CHANGELOG.md b/tox-crypto/CHANGELOG.md
new file mode 100644
index 00000000..f7064c45
--- /dev/null
+++ b/tox-crypto/CHANGELOG.md
@@ -0,0 +1,5 @@
+# Revision history for tox-crypto
+
+## 0.1.0.0 -- YYYY-mm-dd
+
+* First version. Released on an unsuspecting world.
diff --git a/tox-crypto/CHANGELOG.md.save0 b/tox-crypto/CHANGELOG.md.save0
new file mode 100644
index 00000000..f7064c45
--- /dev/null
+++ b/tox-crypto/CHANGELOG.md.save0
@@ -0,0 +1,5 @@
+# Revision history for tox-crypto
+
+## 0.1.0.0 -- YYYY-mm-dd
+
+* First version. Released on an unsuspecting world.
diff --git a/tox-crypto/LICENSE b/tox-crypto/LICENSE
new file mode 100644
index 00000000..e8eaef49
--- /dev/null
+++ b/tox-crypto/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2019, James Crayne
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of James Crayne nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/tox-crypto/LICENSE.save0 b/tox-crypto/LICENSE.save0
new file mode 100644
index 00000000..e8eaef49
--- /dev/null
+++ b/tox-crypto/LICENSE.save0
@@ -0,0 +1,30 @@
+Copyright (c) 2019, James Crayne
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of James Crayne nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/tox-crypto/Setup.hs b/tox-crypto/Setup.hs
new file mode 100644
index 00000000..9a994af6
--- /dev/null
+++ b/tox-crypto/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/tox-crypto/Setup.hs.save0 b/tox-crypto/Setup.hs.save0
new file mode 100644
index 00000000..9a994af6
--- /dev/null
+++ b/tox-crypto/Setup.hs.save0
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/src/Crypto/Tox.hs b/tox-crypto/src/Crypto/Tox.hs
index 1b3d5e5c..ea276045 100644
--- a/src/Crypto/Tox.hs
+++ b/tox-crypto/src/Crypto/Tox.hs
@@ -14,6 +14,7 @@
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE OverloadedStrings #-}
 module Crypto.Tox
     ( PublicKey
     , publicKey
diff --git a/tox-crypto/src/DebugTag.hs b/tox-crypto/src/DebugTag.hs
new file mode 100644
index 00000000..9ac04bb0
--- /dev/null
+++ b/tox-crypto/src/DebugTag.hs
@@ -0,0 +1,24 @@
+module DebugTag where
+
+import Data.Typeable
+
+-- | Debug Tags, add more as needed, but ensure XAnnounce is always first, XMisc last
+data DebugTag
+  = XAnnounce
+  | XBitTorrent
+  | XDHT
+  | XLan
+  | XMan
+  | XNetCrypto
+  | XNetCryptoOut
+  | XOnion
+  | XRoutes
+  | XPing
+  | XRefresh
+  | XJabber
+  | XTCP
+  | XMisc
+  | XNodeinfoSearch
+  | XUnexpected -- Used only for special anomalous errors that we didn't expect to happen.
+  | XUnused     -- Never commit code that uses XUnused.
+  deriving (Eq, Ord, Show, Read, Enum, Bounded,Typeable)
diff --git a/tox-crypto/tox-crypto.cabal b/tox-crypto/tox-crypto.cabal
new file mode 100644
index 00000000..9737e5d9
--- /dev/null
+++ b/tox-crypto/tox-crypto.cabal
@@ -0,0 +1,59 @@
+-- Initial tox-crypto.cabal generated by cabal init.  For further
+-- documentation, see http://haskell.org/cabal/users-guide/
+
+name:                tox-crypto
+version:             0.1.0.0
+-- synopsis:
+-- description:
+license:             BSD3
+license-file:        LICENSE
+author:              James Crayne
+maintainer:          jim.crayne@gmail.com
+-- copyright:
+-- category:
+build-type:          Simple
+extra-source-files:  CHANGELOG.md
+cabal-version:       >=1.10
+
+library
+  exposed-modules:     Crypto.Tox
+  -- other-modules:
+  other-extensions:    CPP
+        , GeneralizedNewtypeDeriving
+        , ScopedTypeVariables
+        , KindSignatures
+        , DeriveDataTypeable
+        , DeriveFunctor
+        , DeriveGeneric
+        , DeriveTraversable
+        , TypeOperators
+        , MagicHash
+        , UnboxedTuples
+        , BangPatterns
+        , MultiParamTypeClasses
+        , ConstraintKinds
+        , Rank2Types
+        , NamedFieldPuns
+        , PatternSynonyms
+        , FlexibleContexts
+  build-depends:
+          base
+        , cpu
+        , memory
+        , base64-bytestring
+        , base16-bytestring
+        , cereal
+        , word64-map
+        , contravariant
+        , rank2classes
+        , network
+        , bytestring
+        , stm
+        , ghc-prim
+        , time
+        , cryptonite
+        , dput-hslogger
+        , hashable
+        , minmax-psq
+  hs-source-dirs:      src
+  default-language:    Haskell2010
diff --git a/word64-map/CHANGELOG.md b/word64-map/CHANGELOG.md
new file mode 100644
index 00000000..d325ac08
--- /dev/null
+++ b/word64-map/CHANGELOG.md
@@ -0,0 +1,5 @@
+# Revision history for word64-map
+
+## 0.1.0.0 -- YYYY-mm-dd
+
+* First version. Released on an unsuspecting world.
diff --git a/word64-map/LICENSE b/word64-map/LICENSE
new file mode 100644
index 00000000..e8eaef49
--- /dev/null
+++ b/word64-map/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2019, James Crayne
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of James Crayne nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/word64-map/Setup.hs b/word64-map/Setup.hs
new file mode 100644
index 00000000..9a994af6
--- /dev/null
+++ b/word64-map/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/src/Data/Word64Map.hs b/word64-map/src/Data/Word64Map.hs
index adc9c27e..adc9c27e 100644
--- a/src/Data/Word64Map.hs
+++ b/word64-map/src/Data/Word64Map.hs
diff --git a/word64-map/word64-map.cabal b/word64-map/word64-map.cabal
new file mode 100644
index 00000000..938d2e22
--- /dev/null
+++ b/word64-map/word64-map.cabal
@@ -0,0 +1,26 @@
+-- Initial word64-map.cabal generated by cabal init.  For further
+-- documentation, see http://haskell.org/cabal/users-guide/
+
+name:                word64-map
+version:             0.1.0.0
+-- synopsis:
+-- description:
+license:             BSD3
+license-file:        LICENSE
+author:              James Crayne
+maintainer:          jim.crayne@gmail.com
+-- copyright:
+-- category:
+build-type:          Simple
+extra-source-files:  CHANGELOG.md
+cabal-version:       >=1.10
+
+library
+  exposed-modules:     Data.Word64Map
+  -- other-modules:
+  other-extensions:    RankNTypes, ScopedTypeVariables, UnboxedTuples
+  build-depends:
+          base
+        , containers
+  hs-source-dirs:      src
+  default-language:    Haskell2010