diff --git a/parser/position.go b/scanner/position.go
similarity index 98%
rename from parser/position.go
rename to scanner/position.go
index ca09d54..8ba9195 100644
--- a/parser/position.go
+++ b/scanner/position.go
@@ -1,4 +1,4 @@
-package parser
+package scanner
 
 import "fmt"
 
diff --git a/parser/lexer.go b/scanner/scanner.go
similarity index 99%
rename from parser/lexer.go
rename to scanner/scanner.go
index 720b37f..c3dd565 100644
--- a/parser/lexer.go
+++ b/scanner/scanner.go
@@ -1,4 +1,4 @@
-package parser
+package scanner
 
 import (
 	"bytes"
diff --git a/parser/lexer_test.go b/scanner/scanner_text.go
similarity index 97%
rename from parser/lexer_test.go
rename to scanner/scanner_text.go
index 666e48c..2c5f80c 100644
--- a/parser/lexer_test.go
+++ b/scanner/scanner_text.go
@@ -1,4 +1,4 @@
-package parser
+package scanner
 
 import (
 	"bytes"
@@ -15,8 +15,8 @@ type token struct {
 
 func TestBool(t *testing.T) {
 	var tokenList = []token{
-		{BOOL, "true"},
-		{BOOL, "false"},
+		{token.BOOL, "true"},
+		{token.BOOL, "false"},
 	}
 
 	// create artifical source code
diff --git a/parser/token.go b/token/token.go
similarity index 99%
rename from parser/token.go
rename to token/token.go
index 8dda237..cbd822d 100644
--- a/parser/token.go
+++ b/token/token.go
@@ -1,4 +1,4 @@
-package parser
+package token
 
 import "strconv"