--- a/src/dispatch.rs	Sat Dec 03 11:18:18 2016 +0100
+++ b/src/dispatch.rs	Sat Dec 03 11:18:41 2016 +0100
@@ -4,7 +4,7 @@
 use std::io::Result;
 
 use config::Config;
-use unix_datagram_stream::{UnixDatagramStream, new_unix_dgram_stream};
+use dgram_stream;
 
 use futures::Stream;
 use tokio_core::reactor::Core;
@@ -16,8 +16,8 @@
     let mut LOOP = try!(Core::new());
     let handle = LOOP.handle();
 
-    let log_socket = try!(UnixDatagram::bind(cfg.bind_path, &handle));
-    let log_incoming_stream = new_unix_dgram_stream(cfg.max_msg_len, log_socket);
+    let log_socket = try!(UnixDatagram::bind(cfg.general.bind_path, &handle));
+    let log_incoming_stream = dgram_stream::new_unix_dgram_stream(cfg.general.max_msg_len, log_socket);
 
     let finished = log_incoming_stream.for_each(|msg_buf| {
         let msg = String::from_utf8(msg_buf).unwrap_or("<UTF8 decoding error>".to_string());

--- a/src/main.rs	Sat Dec 03 11:18:18 2016 +0100
+++ b/src/main.rs	Sat Dec 03 11:18:41 2016 +0100
@@ -4,13 +4,15 @@
 extern crate tokio_uds;
 
 mod config;
+mod dgram_stream;
 mod dispatch;
+mod error;
 mod priority;
-mod unix_datagram_stream;
 
 fn main() {
     let mut cfg = config::Config::default();
-    cfg.bind_path = "./test_log_sock.sock".to_string();
+    cfg.general.bind_path = "./test_log_sock.sock".to_string();
+    cfg.general.max_msg_len = 2048;
 
-    dispatch::setup_and_run(cfg);
+    dispatch::setup_and_run(cfg).unwrap();
 }