diff --git a/php5/parser.go b/php5/parser.go
index c734189..4cafe2d 100644
--- a/php5/parser.go
+++ b/php5/parser.go
@@ -1,3 +1,4 @@
+// Package php5 parses PHP5
 package php5
 
 import (
diff --git a/php7/parser.go b/php7/parser.go
index 4b6f836..4518a64 100644
--- a/php7/parser.go
+++ b/php7/parser.go
@@ -1,3 +1,4 @@
+// Package php7 parses PHP7
 package php7
 
 import (
diff --git a/scanner/lexer.go b/scanner/lexer.go
index 617ad70..0ddf176 100644
--- a/scanner/lexer.go
+++ b/scanner/lexer.go
@@ -1,3 +1,4 @@
+// Package scanner transforms an input string into a stream of PHP tokens.
 package scanner
 
 import (
diff --git a/visitor/dumper.go b/visitor/dumper.go
index 2ad5a2d..0674390 100644
--- a/visitor/dumper.go
+++ b/visitor/dumper.go
@@ -1,4 +1,5 @@
-package visitor // Visitor implementations
+// Package visitor contains walker.visitor implementations
+package visitor
 
 import (
 	"fmt"
diff --git a/walker/walker.go b/walker/walker.go
index 45aa471..2fc8fe5 100644
--- a/walker/walker.go
+++ b/walker/walker.go
@@ -1,4 +1,5 @@
-package walker // Node walking behavior
+// Package walker declares walking behavior
+package walker
 
 // Walkable interface
 //