diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 0.13.0
+### Changed
+- Depend on Haskoin Store 0.13.3.
+- Better code organisation.
+
 ## 0.12.0
 ### Changed
 - Add a test suite that simulates network instead of connecting to real one.
diff --git a/haskoin-node.cabal b/haskoin-node.cabal
--- a/haskoin-node.cabal
+++ b/haskoin-node.cabal
@@ -4,10 +4,10 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 5146a554596617bed514f4367a6d203381cfbe8e7848f1bd4835d92fa9727df9
+-- hash: dd35e7fe4a17f0db9c152f68c7e00a0dd8d92536e04aced986b481b462f30705
 
 name:           haskoin-node
-version:        0.12.0
+version:        0.13.0
 synopsis:       Haskoin Node P2P library for Bitcoin and Bitcoin Cash
 description:    Bitcoin and Bitcoin Cash peer-to-peer protocol library featuring headers-first synchronisation.
 category:       Bitcoin, Finance, Network
@@ -39,7 +39,6 @@
       src
   build-depends:
       base >=4.9 && <5
-    , base64
     , bytestring
     , cereal
     , conduit
@@ -47,7 +46,7 @@
     , containers
     , data-default
     , hashable
-    , haskoin-core >=0.10.1
+    , haskoin-core >=0.13.3
     , monad-logger
     , mtl
     , network
@@ -83,7 +82,7 @@
     , containers
     , data-default
     , hashable
-    , haskoin-core >=0.10.1
+    , haskoin-core >=0.13.3
     , haskoin-node
     , hspec
     , monad-logger
diff --git a/src/Haskoin/Node.hs b/src/Haskoin/Node.hs
--- a/src/Haskoin/Node.hs
+++ b/src/Haskoin/Node.hs
@@ -15,33 +15,22 @@
 forwarded to the listen action provided in the node configuration.
 -}
 module Haskoin.Node
-    ( Host
+    ( -- * Types
+      Host
     , Port
     , HostPort
-    , Peer
-    , Chain
-    , PeerManager
-    , WithConnection
-    , Conduits(..)
-    , ChainMessage(..)
-    , PeerManagerMessage(..)
-    , PeerMessage(..)
-    , OnlinePeer(..)
+
+      -- * Node
     , NodeConfig(..)
     , NodeEvent(..)
-    , ChainEvent(..)
-    , PeerEvent(..)
-    , PeerException(..)
     , withNode
     , node
-    , managerGetPeers
-    , managerGetPeer
-    , managerPeerText
-    , killPeer
-    , sendMessage
-    , peerGetPublisher
-    , peerGetBlocks
-    , peerGetTxs
+
+      -- * Header Chain
+    , Chain
+    , ChainMessage
+    , ChainConfig(..)
+    , ChainEvent(..)
     , chainGetBlock
     , chainGetBest
     , chainGetAncestor
@@ -49,7 +38,32 @@
     , chainGetSplitBlock
     , chainBlockMain
     , chainIsSynced
+
+      -- * Peer Manager
+    , PeerManager
+    , PeerManagerMessage
+    , PeerManagerConfig(..)
+    , PeerEvent(..)
+    , OnlinePeer(..)
+    , managerGetPeers
+    , managerGetPeer
+    , managerPeerText
+
+      -- * Peer
+    , Peer
+    , WithConnection
+    , PeerMessage
+    , PeerConfig(..)
+    , PeerException(..)
+    , Conduits(..)
     , withConnection
+    , killPeer
+    , sendMessage
+    , peerGetPublisher
+    , peerGetBlocks
+    , peerGetTxs
+
+      -- * Misc
     , myVersion
     , buildVersion
     ) where
@@ -62,8 +76,9 @@
                                        ChainMessage (..), Conduits (..), Host,
                                        HostPort, NodeConfig (..),
                                        NodeEvent (..), OnlinePeer (..), Peer,
-                                       PeerEvent (..), PeerException (..),
-                                       PeerManager, PeerManagerConfig (..),
+                                       PeerConfig (..), PeerEvent (..),
+                                       PeerException (..), PeerManager,
+                                       PeerManagerConfig (..),
                                        PeerManagerMessage (..),
                                        PeerMessage (..), Port, WithConnection,
                                        buildVersion, chainBlockMain,