diff --git a/README.md b/README.md
index ebbcfd2..d1aaecb 100644
--- a/README.md
+++ b/README.md
@@ -25,18 +25,21 @@ package main
 import (
 	"bytes"
 
-	"github.com/z7zmey/php-parser/parser"
+	"github.com/z7zmey/php-parser/php5"
 	"github.com/z7zmey/php-parser/visitor"
 )
 
 func main() {
 	src := bytes.NewBufferString(`<? echo "Hello world";`)
-	nodes, comments, positions := parser.ParsePhp7(src, "example.php")
+	nodes, comments, positions := php5.Parse(src, "example.php")
 
-	visitor := Dumper{"", comments, positions}
+	visitor := visitor.Dumper{
+		Indent:    "",
+		Comments:  comments,
+		Positions: positions,
+	}
 	nodes.Walk(visitor)
 }
-
 ```
 
 ## Roadmap
diff --git a/main.go b/main.go
index 34ea872..35488fc 100644
--- a/main.go
+++ b/main.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/yookoala/realpath"
 	"github.com/z7zmey/php-parser/php5"
+	"github.com/z7zmey/php-parser/visitor"
 )
 
 func main() {
@@ -25,7 +26,7 @@ func main() {
 				src, _ := os.Open(string(path))
 				nodes, comments, positions := php5.Parse(src, path)
 
-				visitor := Dumper{
+				visitor := visitor.Dumper{
 					Indent:    "  | ",
 					Comments:  comments,
 					Positions: positions,
diff --git a/dumper.go b/visitor/dumper.go
similarity index 98%
rename from dumper.go
rename to visitor/dumper.go
index da02e3b..8e3995c 100644
--- a/dumper.go
+++ b/visitor/dumper.go
@@ -1,4 +1,4 @@
-package main
+package visitor
 
 import (
 	"fmt"