diff --git a/cmd/drone-build/run.go b/cmd/drone-build/run.go
index 5f2c0a1a..e275e7fa 100644
--- a/cmd/drone-build/run.go
+++ b/cmd/drone-build/run.go
@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 
 	"github.com/drone/drone/common"
-	"github.com/drone/drone/parser"
-	"github.com/drone/drone/parser/inject"
+	"github.com/drone/drone/pkg/yaml"
+	"github.com/drone/drone/pkg/yaml/inject"
 	"github.com/samalba/dockerclient"
 )
 
diff --git a/server/badge_test.go b/server/badge_test.go
index bfdcc178..113727a4 100644
--- a/server/badge_test.go
+++ b/server/badge_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/drone/drone/common"
 	"github.com/drone/drone/common/ccmenu"
-	"github.com/drone/drone/datastore/mock"
+	"github.com/drone/drone/pkg/store/mock"
 	"github.com/drone/drone/server/recorder"
 
 	. "github.com/franela/goblin"
@@ -35,7 +35,7 @@ var badgeTests = []struct {
 }
 
 func TestBadges(t *testing.T) {
-	store := new(mocks.Datastore)
+	store := new(mocks.Store)
 	url_, _ := url.Parse("http://localhost:8080")
 
 	g := Goblin(t)
diff --git a/server/user_test.go b/server/user_test.go
index 2b678ec5..409608e4 100644
--- a/server/user_test.go
+++ b/server/user_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/drone/drone/common"
-	"github.com/drone/drone/datastore/mock"
+	"github.com/drone/drone/pkg/store/mock"
 	"github.com/drone/drone/server/recorder"
 	. "github.com/franela/goblin"
 	"github.com/gin-gonic/gin"