diff --git a/gql/lexer/lexer.go b/gql/lexer.go
similarity index 99%
rename from gql/lexer/lexer.go
rename to gql/lexer.go
index 4a4420e1d67458bff073cbdf0873cef07886a6a1..4b1be18555c28000766a4a573485812058e22596 100644
--- a/gql/lexer/lexer.go
+++ b/gql/lexer.go
@@ -1,4 +1,4 @@
-package gqlex
+package gql
 
 import (
 	"fmt"
diff --git a/gql/lexer/lexer_test.go b/gql/lexer_test.go
similarity index 95%
rename from gql/lexer/lexer_test.go
rename to gql/lexer_test.go
index a358a2af2cc15f65012c12ef9a07afada168e6a8..91ea5be51e566952d4181cf76ab4c3d450520a95 100644
--- a/gql/lexer/lexer_test.go
+++ b/gql/lexer_test.go
@@ -1,4 +1,4 @@
-package gqlex
+package gql
 
 import (
 	"fmt"
diff --git a/gql/lexer/state.go b/gql/state.go
similarity index 99%
rename from gql/lexer/state.go
rename to gql/state.go
index 163ec6ad957d72236997afb318ec215391f2cab0..01e967ea3c363de553ad74d468b8069b3e60ba90 100644
--- a/gql/lexer/state.go
+++ b/gql/state.go
@@ -1,4 +1,4 @@
-package gqlex
+package gql
 
 const (
 	leftCurl  = '{'