diff --git a/parser/inject/inject.go b/pkg/yaml/inject/inject.go
similarity index 100%
rename from parser/inject/inject.go
rename to pkg/yaml/inject/inject.go
diff --git a/parser/inject/inject_test.go b/pkg/yaml/inject/inject_test.go
similarity index 100%
rename from parser/inject/inject_test.go
rename to pkg/yaml/inject/inject_test.go
diff --git a/parser/lint.go b/pkg/yaml/lint.go
similarity index 100%
rename from parser/lint.go
rename to pkg/yaml/lint.go
diff --git a/parser/lint_test.go b/pkg/yaml/lint_test.go
similarity index 100%
rename from parser/lint_test.go
rename to pkg/yaml/lint_test.go
diff --git a/parser/matrix/matrix.go b/pkg/yaml/matrix/matrix.go
similarity index 100%
rename from parser/matrix/matrix.go
rename to pkg/yaml/matrix/matrix.go
diff --git a/parser/matrix/matrix_test.go b/pkg/yaml/matrix/matrix_test.go
similarity index 100%
rename from parser/matrix/matrix_test.go
rename to pkg/yaml/matrix/matrix_test.go
diff --git a/parser/parse.go b/pkg/yaml/parse.go
similarity index 96%
rename from parser/parse.go
rename to pkg/yaml/parse.go
index 2c8390e9..dc1d1ed8 100644
--- a/parser/parse.go
+++ b/pkg/yaml/parse.go
@@ -2,8 +2,8 @@ package parser
 
 import (
 	"github.com/drone/drone/common"
-	"github.com/drone/drone/parser/inject"
-	"github.com/drone/drone/parser/matrix"
+	"github.com/drone/drone/pkg/yaml/inject"
+	"github.com/drone/drone/pkg/yaml/matrix"
 
 	"gopkg.in/yaml.v2"
 )
diff --git a/parser/trans.go b/pkg/yaml/trans.go
similarity index 100%
rename from parser/trans.go
rename to pkg/yaml/trans.go
diff --git a/parser/trans_test.go b/pkg/yaml/trans_test.go
similarity index 100%
rename from parser/trans_test.go
rename to pkg/yaml/trans_test.go
diff --git a/server/commits.go b/server/commits.go
index 5e852482..4313034e 100644
--- a/server/commits.go
+++ b/server/commits.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/drone/drone/common"
-	"github.com/drone/drone/parser/inject"
+	"github.com/drone/drone/pkg/yaml/inject"
 	"github.com/drone/drone/queue"
 	"github.com/gin-gonic/gin"
 	// "github.com/gin-gonic/gin/binding"
diff --git a/server/hooks.go b/server/hooks.go
index ac011335..c27cd793 100644
--- a/server/hooks.go
+++ b/server/hooks.go
@@ -5,9 +5,9 @@ import (
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/drone/drone/common"
-	"github.com/drone/drone/parser"
-	"github.com/drone/drone/parser/inject"
-	"github.com/drone/drone/parser/matrix"
+	"github.com/drone/drone/pkg/yaml"
+	"github.com/drone/drone/pkg/yaml/inject"
+	"github.com/drone/drone/pkg/yaml/matrix"
 	"github.com/drone/drone/queue"
 	"github.com/gin-gonic/gin"
 )