diff --git a/src/Quasar/Network.hs b/src/Quasar/Network.hs
index 64ca1aa619e0b39b3d41610080c34f8150313862..3f938a79f1518b590c919b3b75db1d3f3f568c46 100644
--- a/src/Quasar/Network.hs
+++ b/src/Quasar/Network.hs
@@ -1,4 +1,57 @@
-module Quasar.Network where
+module Quasar.Network (
+  -- * Rpc api definition
+  RpcApi,
+  RpcFunction,
+  RpcArgument,
+  RpcResult,
+  RpcStream,
+  rpcApi,
+  rpcFunction,
+  addArgument,
+  addResult,
+  addStream,
+  setFixedHandler,
+  makeRpc,
+  --makeProtocol,
+  --makeClient,
+  --makeServer,
+  --RpcProtocol(ProtocolRequest, ProtocolResponse),
+  --HasProtocolImpl
+  Client,
+  clientSend,
+  clientClose,
+  clientReportProtocolError,
+
+  -- * Runtime
+  Stream,
+  streamSend,
+  streamSetHandler,
+  streamClose,
+
+  -- ** Client
+  withClientTCP,
+  --newClientTCP,
+  withClientUnix,
+  --newClientUnix,
+  withClient,
+  --newClient,
+
+  -- ** Server
+  Server,
+  Listener,
+  runServer,
+  withServer,
+  withLocalClient,
+  --newLocalClient,
+  listenTCP,
+  listenUnix,
+  listenOnBoundSocket,
+
+  -- ** Test implementation
+  --TODO remove here
+  withStandaloneClient,
+
+) where
 
 import Control.Applicative (liftA2)
 import Control.Concurrent (forkFinally)