diff --git a/src/main.rs b/src/main.rs
index d3fcadb..b55dfaf 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,81 +1,12 @@
 #![feature(unix_socket_ancillary_data)]
-use std::{env::var, error::Error, io::Read, os::unix::net::UnixStream, u32};
+use std::error::Error;
 
-mod shm;
-mod wl_shm;
+mod wl_client;
 mod wl_registry;
+mod wl_shm;
 mod vec_utils;
-pub use vec_utils::WlMessage;
-
-struct WlHeader {
-    object: u32,
-    opcode: u16,
-    size: u16
-}
-
-struct WlClient {
-    socket:         UnixStream,
-    current_id:     u32,
-    registry_id:    Option<u32>,
-    shm_id:         Option<u32>,
-    shm_pool:       Option<shm::ShmPool>
-}
-
-impl WlClient {
-    fn new() -> Result<Self, Box<dyn Error>> {
-        let sock = UnixStream::connect(format!(
-            "{}/{}",
-            var("XDG_RUNTIME_DIR")?,
-            var("WAYLAND_DISPLAY")?
-        ))?;
-
-        let res = WlClient {
-            socket:      sock,
-            current_id:  1, 
-            registry_id: None,
-            shm_id:      None,
-            shm_pool:    None,
-        };
-
-        Ok(res)
-    }
-
-    fn read_event(&mut self) -> Result<(), Box<dyn Error>> {
-        // TODO: Don't realloc header and event
-
-        let mut header = vec![0u8; 8];
-        self.socket.read_exact(&mut header)?;
-
-        let header = WlHeader {
-            object: u32::from_ne_bytes(header[0..4].try_into()?),
-            opcode: u16::from_ne_bytes(header[4..6].try_into()?),
-            size:   u16::from_ne_bytes(header[6..8].try_into()?)
-        };
-
-        let mut event = vec![0u8; header.size as usize - 8];
-        self.socket.read_exact(&mut event)?;
-
-        if header.object == self.registry_id.unwrap() && header.opcode == 0 { // wl_registry::global
-            self.wl_registry_global(&event)?;
-        }
-        else if header.object == 1 && header.opcode == 0 { // wl_display::error
-            WlClient::wl_display_error(&event);
-        }
-        else if self.shm_id.is_some() && header.object == self.shm_id.unwrap() && header.opcode == 0 { // wl_shm::format
-            WlClient::wl_shm_format(&event);
-        }
-        else {
-            println!(
-                "Received event:\n\tObject: {}\n\tOpcode: {}\n\tSize: {}",
-                header.object,
-                header.opcode,
-                header.size
-            );
-        }
-
-        Ok(())
-    }
-}
+mod shm;
+use wl_client::WlClient;
 
 fn main() -> Result<(), Box<dyn Error>> {
     let mut wl_client = WlClient::new()?;
diff --git a/src/wl_client.rs b/src/wl_client.rs
new file mode 100644
index 0000000..96ce870
--- /dev/null
+++ b/src/wl_client.rs
@@ -0,0 +1,74 @@
+use std::{env::var, error::Error, io::Read, os::unix::net::UnixStream, u32};
+
+use crate::shm;
+
+struct WlHeader {
+    object: u32,
+    opcode: u16,
+    size: u16
+}
+
+pub struct WlClient {
+    pub socket:         UnixStream,
+    pub current_id:     u32,
+    pub registry_id:    Option<u32>,
+    pub shm_id:         Option<u32>,
+    pub shm_pool:       Option<shm::ShmPool>
+}
+
+impl WlClient {
+    pub fn new() -> Result<Self, Box<dyn Error>> {
+        let sock = UnixStream::connect(format!(
+            "{}/{}",
+            var("XDG_RUNTIME_DIR")?,
+            var("WAYLAND_DISPLAY")?
+        ))?;
+
+        let res = WlClient {
+            socket:      sock,
+            current_id:  1, 
+            registry_id: None,
+            shm_id:      None,
+            shm_pool:    None,
+        };
+
+        Ok(res)
+    }
+
+    pub fn read_event(&mut self) -> Result<(), Box<dyn Error>> {
+        // TODO: Don't realloc header and event
+
+        let mut header = vec![0u8; 8];
+        self.socket.read_exact(&mut header)?;
+
+        let header = WlHeader {
+            object: u32::from_ne_bytes(header[0..4].try_into()?),
+            opcode: u16::from_ne_bytes(header[4..6].try_into()?),
+            size:   u16::from_ne_bytes(header[6..8].try_into()?)
+        };
+
+        let mut event = vec![0u8; header.size as usize - 8];
+        self.socket.read_exact(&mut event)?;
+
+        if header.object == self.registry_id.unwrap() && header.opcode == 0 { // wl_registry::global
+            self.wl_registry_global(&event)?;
+        }
+        else if header.object == 1 && header.opcode == 0 { // wl_display::error
+            WlClient::wl_display_error(&event);
+        }
+        else if self.shm_id.is_some() && header.object == self.shm_id.unwrap() && header.opcode == 0 { // wl_shm::format
+            WlClient::wl_shm_format(&event);
+        }
+        else {
+            println!(
+                "Received event:\n\tObject: {}\n\tOpcode: {}\n\tSize: {}",
+                header.object,
+                header.opcode,
+                header.size
+            );
+        }
+
+        Ok(())
+    }
+}
+