diff --git a/src/main.rs b/src/main.rs
index d389ac6..187b90c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,63 +1,14 @@
 extern crate ansi_term;
 
-use std::io::{BufRead, BufReader};
+use std::io::BufReader;
 use std::fs::File;
 use std::{env, process};
-use std::convert::From;
 
+mod types;
+mod tokenizer;
 
-#[derive(Debug, Eq, PartialEq)]
-enum LineType {
-    Empty,
-    Title(String),
-    Description(String),
-    ExampleText(String),
-    ExampleCode(String),
-    Other(String),
-}
+use tokenizer::Tokenizer;
 
-impl<'a> From<&'a str> for LineType {
-    /// Convert a string slice to a LineType. Newlines and whitespace are trimmed.
-    fn from(line: &'a str) -> LineType {
-        let trimmed = line.trim();
-        let mut chars = trimmed.chars();
-        match chars.next() {
-            None => LineType::Empty,
-            Some('#') => LineType::Title(trimmed.trim_left_matches(|chr: char| chr == '#' || chr.is_whitespace()).into()),
-            Some('>') => LineType::Description(trimmed.trim_left_matches(|chr: char| chr == '>' || chr.is_whitespace()).into()),
-            Some('-') => LineType::ExampleText(trimmed.trim_left_matches(|chr: char| chr == '-' || chr.is_whitespace()).into()),
-            Some('`') if chars.last() == Some('`') => LineType::ExampleCode(trimmed.trim_matches(|chr: char| chr == '`' || chr.is_whitespace()).into()),
-            _ => LineType::Other(trimmed.into()),
-        }
-    }
-}
-
-
-#[derive(Debug)]
-struct Tokenizer<R: BufRead> {
-    reader: R,
-    current_line: String,
-}
-
-impl<R> Tokenizer<R> where R: BufRead {
-
-    fn new(reader: R) -> Tokenizer<R> {
-        Tokenizer {
-            reader: reader,
-            current_line: String::new(),
-        }
-    }
-
-    fn next(&mut self) -> Option<LineType> {
-        self.current_line.clear();
-        let bytes_read = self.reader.read_line(&mut self.current_line).unwrap();
-        match bytes_read {
-            0 => None,
-            _ => Some(LineType::from(&self.current_line[..])),
-        }
-    }
-
-}
 
 /// Open file, return a `BufRead` instance
 fn get_file_reader(filepath: &str) -> Result<BufReader<File>, String> {
@@ -97,7 +48,7 @@ fn main() {
 
 #[cfg(test)]
 mod test {
-    use super::LineType;
+    use types::LineType;
 
     #[test]
     fn test_linetype_from_str() {
diff --git a/src/tokenizer.rs b/src/tokenizer.rs
new file mode 100644
index 0000000..9c9fce5
--- /dev/null
+++ b/src/tokenizer.rs
@@ -0,0 +1,32 @@
+//! Code to tokenize a `BufRead` instance into an iterator of `LineType`s.
+
+use std::io::BufRead;
+
+use types::LineType;
+
+
+#[derive(Debug)]
+pub struct Tokenizer<R: BufRead> {
+    reader: R,
+    current_line: String,
+}
+
+impl<R> Tokenizer<R> where R: BufRead {
+
+    pub fn new(reader: R) -> Tokenizer<R> {
+        Tokenizer {
+            reader: reader,
+            current_line: String::new(),
+        }
+    }
+
+    pub fn next(&mut self) -> Option<LineType> {
+        self.current_line.clear();
+        let bytes_read = self.reader.read_line(&mut self.current_line).unwrap();
+        match bytes_read {
+            0 => None,
+            _ => Some(LineType::from(&self.current_line[..])),
+        }
+    }
+
+}
diff --git a/src/types.rs b/src/types.rs
new file mode 100644
index 0000000..1828d0b
--- /dev/null
+++ b/src/types.rs
@@ -0,0 +1,27 @@
+//! Types used in the client.
+
+#[derive(Debug, Eq, PartialEq)]
+pub enum LineType {
+    Empty,
+    Title(String),
+    Description(String),
+    ExampleText(String),
+    ExampleCode(String),
+    Other(String),
+}
+
+impl<'a> From<&'a str> for LineType {
+    /// Convert a string slice to a LineType. Newlines and whitespace are trimmed.
+    fn from(line: &'a str) -> LineType {
+        let trimmed = line.trim();
+        let mut chars = trimmed.chars();
+        match chars.next() {
+            None => LineType::Empty,
+            Some('#') => LineType::Title(trimmed.trim_left_matches(|chr: char| chr == '#' || chr.is_whitespace()).into()),
+            Some('>') => LineType::Description(trimmed.trim_left_matches(|chr: char| chr == '>' || chr.is_whitespace()).into()),
+            Some('-') => LineType::ExampleText(trimmed.trim_left_matches(|chr: char| chr == '-' || chr.is_whitespace()).into()),
+            Some('`') if chars.last() == Some('`') => LineType::ExampleCode(trimmed.trim_matches(|chr: char| chr == '`' || chr.is_whitespace()).into()),
+            _ => LineType::Other(trimmed.into()),
+        }
+    }
+}