diff --git a/src/lexer/mod.rs b/src/lexer/mod.rs
index 2ca4ce5..d447bb3 100644
--- a/src/lexer/mod.rs
+++ b/src/lexer/mod.rs
@@ -1,49 +1,12 @@
 //! # Lexer
 
-use std::fmt;
+pub mod token;
 
 use characters;
 use characters::CharAt;
 use characters::Lexable;
 use characters::RelativeIndexable;
 
-pub enum Kind {
-    LeftParen,
-    RightParen,
-    Identifier,
-}
-
-impl fmt::Display for Kind {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let s = match *self {
-            Kind::LeftParen => "LeftParen",
-            Kind::RightParen => "RightParen",
-            Kind::Identifier => "Identifier",
-        };
-        write!(f, "{}", s)
-    }
-}
-
-pub struct Token {
-    kind: Kind,
-    value: String,
-}
-
-impl Token {
-    fn new(kind: Kind, value: String) -> Token {
-        Token {
-            kind: kind,
-            value: value,
-        }
-    }
-}
-
-impl fmt::Display for Token {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "({}, \"{}\")", self.kind, self.value)
-    }
-}
-
 enum State {
     Initial,
     Identifier,
diff --git a/src/lexer/token.rs b/src/lexer/token.rs
new file mode 100644
index 0000000..5e88b9b
--- /dev/null
+++ b/src/lexer/token.rs
@@ -0,0 +1,42 @@
+/// # Token
+
+use std::fmt;
+
+pub enum Kind {
+    LeftParen,
+    RightParen,
+    Identifier,
+}
+
+pub struct Token {
+    kind: Kind,
+    value: String,
+}
+
+impl Token {
+    fn new(kind: Kind, value: String) -> Token {
+        Token { kind: kind, value: value, }
+    }
+}
+
+//
+// Display
+//
+
+impl fmt::Display for Kind {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let s = match *self {
+            Kind::LeftParen => "LeftParen",
+            Kind::RightParen => "RightParen",
+            Kind::Identifier => "Identifier",
+        };
+        write!(f, "{}", s)
+    }
+}
+
+impl fmt::Display for Token {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "({}, \"{}\")", self.kind, self.value)
+    }
+}
+