diff --git a/api/server/router/local/image.go b/api/server/router/local/image.go
index 019b2ed5a2..331e959344 100644
--- a/api/server/router/local/image.go
+++ b/api/server/router/local/image.go
@@ -12,7 +12,7 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/builder"
+	"github.com/docker/docker/builder/dockerfile"
 	"github.com/docker/docker/cliconfig"
 	"github.com/docker/docker/graph"
 	"github.com/docker/docker/pkg/ioutils"
@@ -46,7 +46,7 @@ func (s *router) postCommit(ctx context.Context, w http.ResponseWriter, r *http.
 		return err
 	}
 
-	commitCfg := &builder.CommitConfig{
+	commitCfg := &dockerfile.CommitConfig{
 		Pause:   pause,
 		Repo:    r.Form.Get("repo"),
 		Tag:     r.Form.Get("tag"),
@@ -56,7 +56,7 @@ func (s *router) postCommit(ctx context.Context, w http.ResponseWriter, r *http.
 		Config:  c,
 	}
 
-	imgID, err := builder.Commit(cname, s.daemon, commitCfg)
+	imgID, err := dockerfile.Commit(cname, s.daemon, commitCfg)
 	if err != nil {
 		return err
 	}
@@ -125,7 +125,7 @@ func (s *router) postImagesCreate(ctx context.Context, w http.ResponseWriter, r
 		// generated from the download to be available to the output
 		// stream processing below
 		var newConfig *runconfig.Config
-		newConfig, err = builder.BuildFromConfig(s.daemon, &runconfig.Config{}, r.Form["changes"])
+		newConfig, err = dockerfile.BuildFromConfig(s.daemon, &runconfig.Config{}, r.Form["changes"])
 		if err != nil {
 			return err
 		}
@@ -269,7 +269,7 @@ func (s *router) postBuild(ctx context.Context, w http.ResponseWriter, r *http.R
 	var (
 		authConfigs        = map[string]cliconfig.AuthConfig{}
 		authConfigsEncoded = r.Header.Get("X-Registry-Config")
-		buildConfig        = builder.NewBuildConfig()
+		buildConfig        = dockerfile.NewBuildConfig()
 	)
 
 	if authConfigsEncoded != "" {
@@ -347,7 +347,7 @@ func (s *router) postBuild(ctx context.Context, w http.ResponseWriter, r *http.R
 		}()
 	}
 
-	if err := builder.Build(s.daemon, buildConfig); err != nil {
+	if err := dockerfile.Build(s.daemon, buildConfig); err != nil {
 		// Do not write the error in the http output if it's still empty.
 		// This prevents from writing a 200(OK) when there is an interal error.
 		if !output.Flushed() {
diff --git a/builder/bflag.go b/builder/dockerfile/bflag.go
similarity index 99%
rename from builder/bflag.go
rename to builder/dockerfile/bflag.go
index b94e81abc3..24f73111ba 100644
--- a/builder/bflag.go
+++ b/builder/dockerfile/bflag.go
@@ -1,4 +1,4 @@
-package builder
+package dockerfile
 
 import (
 	"fmt"
diff --git a/builder/bflag_test.go b/builder/dockerfile/bflag_test.go
similarity index 99%
rename from builder/bflag_test.go
rename to builder/dockerfile/bflag_test.go
index 960725dc87..65cfceadd0 100644
--- a/builder/bflag_test.go
+++ b/builder/dockerfile/bflag_test.go
@@ -1,4 +1,4 @@
-package builder
+package dockerfile
 
 import (
 	"testing"
diff --git a/builder/command/command.go b/builder/dockerfile/command/command.go
similarity index 100%
rename from builder/command/command.go
rename to builder/dockerfile/command/command.go
diff --git a/builder/dispatchers.go b/builder/dockerfile/dispatchers.go
similarity index 99%
rename from builder/dispatchers.go
rename to builder/dockerfile/dispatchers.go
index 68be8a1bf1..a1e7396a58 100644
--- a/builder/dispatchers.go
+++ b/builder/dockerfile/dispatchers.go
@@ -1,4 +1,4 @@
-package builder
+package dockerfile
 
 // This file contains the dispatchers for each command. Note that
 // `nullDispatch` is not actually a command, but support for commands we parse
diff --git a/builder/evaluator.go b/builder/dockerfile/evaluator.go
similarity index 98%
rename from builder/evaluator.go
rename to builder/dockerfile/evaluator.go
index 52a16df97d..c202273b9e 100644
--- a/builder/evaluator.go
+++ b/builder/dockerfile/evaluator.go
@@ -1,4 +1,4 @@
-// Package builder is the evaluation step in the Dockerfile parse/evaluate pipeline.
+// Package dockerfile is the evaluation step in the Dockerfile parse/evaluate pipeline.
 //
 // It incorporates a dispatch table based on the parser.Node values (see the
 // parser package for more information) that are yielded from the parser itself.
@@ -17,7 +17,7 @@
 // before and after each step, such as creating an image ID and removing temporary
 // containers and images. Note that ONBUILD creates a kinda-sorta "sub run" which
 // includes its own set of steps (usually only one of them).
-package builder
+package dockerfile
 
 import (
 	"fmt"
@@ -29,8 +29,8 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/api"
-	"github.com/docker/docker/builder/command"
-	"github.com/docker/docker/builder/parser"
+	"github.com/docker/docker/builder/dockerfile/command"
+	"github.com/docker/docker/builder/dockerfile/parser"
 	"github.com/docker/docker/cliconfig"
 	"github.com/docker/docker/daemon"
 	"github.com/docker/docker/pkg/fileutils"
diff --git a/builder/internals.go b/builder/dockerfile/internals.go
similarity index 99%
rename from builder/internals.go
rename to builder/dockerfile/internals.go
index 3b306d290e..2e3a96bafd 100644
--- a/builder/internals.go
+++ b/builder/dockerfile/internals.go
@@ -1,4 +1,4 @@
-package builder
+package dockerfile
 
 // internals for handling commands. Covers many areas and a lot of
 // non-contiguous functionality. Please read the comments.
@@ -19,7 +19,7 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/builder/parser"
+	"github.com/docker/docker/builder/dockerfile/parser"
 	"github.com/docker/docker/cliconfig"
 	"github.com/docker/docker/daemon"
 	"github.com/docker/docker/graph"
diff --git a/builder/internals_unix.go b/builder/dockerfile/internals_unix.go
similarity index 98%
rename from builder/internals_unix.go
rename to builder/dockerfile/internals_unix.go
index aaa9b4205f..5a35f86c1f 100644
--- a/builder/internals_unix.go
+++ b/builder/dockerfile/internals_unix.go
@@ -1,6 +1,6 @@
 // +build freebsd linux
 
-package builder
+package dockerfile
 
 import (
 	"io/ioutil"
diff --git a/builder/internals_windows.go b/builder/dockerfile/internals_windows.go
similarity index 95%
rename from builder/internals_windows.go
rename to builder/dockerfile/internals_windows.go
index d2791de490..8473e48008 100644
--- a/builder/internals_windows.go
+++ b/builder/dockerfile/internals_windows.go
@@ -1,6 +1,6 @@
 // +build windows
 
-package builder
+package dockerfile
 
 import (
 	"io/ioutil"
diff --git a/builder/job.go b/builder/dockerfile/job.go
similarity index 99%
rename from builder/job.go
rename to builder/dockerfile/job.go
index de62666608..1265f5bb61 100644
--- a/builder/job.go
+++ b/builder/dockerfile/job.go
@@ -1,4 +1,4 @@
-package builder
+package dockerfile
 
 import (
 	"bytes"
@@ -12,7 +12,7 @@ import (
 	"sync"
 
 	"github.com/docker/docker/api"
-	"github.com/docker/docker/builder/parser"
+	"github.com/docker/docker/builder/dockerfile/parser"
 	"github.com/docker/docker/cliconfig"
 	"github.com/docker/docker/daemon"
 	"github.com/docker/docker/graph/tags"
diff --git a/builder/job_test.go b/builder/dockerfile/job_test.go
similarity index 99%
rename from builder/job_test.go
rename to builder/dockerfile/job_test.go
index 2f432d70fd..19c1846541 100644
--- a/builder/job_test.go
+++ b/builder/dockerfile/job_test.go
@@ -1,4 +1,4 @@
-package builder
+package dockerfile
 
 import (
 	"bytes"
diff --git a/builder/parser/dumper/main.go b/builder/dockerfile/parser/dumper/main.go
similarity index 100%
rename from builder/parser/dumper/main.go
rename to builder/dockerfile/parser/dumper/main.go
diff --git a/builder/parser/json_test.go b/builder/dockerfile/parser/json_test.go
similarity index 100%
rename from builder/parser/json_test.go
rename to builder/dockerfile/parser/json_test.go
diff --git a/builder/parser/line_parsers.go b/builder/dockerfile/parser/line_parsers.go
similarity index 100%
rename from builder/parser/line_parsers.go
rename to builder/dockerfile/parser/line_parsers.go
diff --git a/builder/parser/parser.go b/builder/dockerfile/parser/parser.go
similarity index 98%
rename from builder/parser/parser.go
rename to builder/dockerfile/parser/parser.go
index 6490fea1c7..2c1cacc939 100644
--- a/builder/parser/parser.go
+++ b/builder/dockerfile/parser/parser.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/docker/docker/builder/command"
+	"github.com/docker/docker/builder/dockerfile/command"
 )
 
 // Node is a structure used to represent a parse tree.
diff --git a/builder/parser/parser_test.go b/builder/dockerfile/parser/parser_test.go
similarity index 100%
rename from builder/parser/parser_test.go
rename to builder/dockerfile/parser/parser_test.go
diff --git a/builder/parser/testfiles-negative/env_no_value/Dockerfile b/builder/dockerfile/parser/testfiles-negative/env_no_value/Dockerfile
similarity index 100%
rename from builder/parser/testfiles-negative/env_no_value/Dockerfile
rename to builder/dockerfile/parser/testfiles-negative/env_no_value/Dockerfile
diff --git a/builder/parser/testfiles-negative/shykes-nested-json/Dockerfile b/builder/dockerfile/parser/testfiles-negative/shykes-nested-json/Dockerfile
similarity index 100%
rename from builder/parser/testfiles-negative/shykes-nested-json/Dockerfile
rename to builder/dockerfile/parser/testfiles-negative/shykes-nested-json/Dockerfile
diff --git a/builder/parser/testfiles/ADD-COPY-with-JSON/Dockerfile b/builder/dockerfile/parser/testfiles/ADD-COPY-with-JSON/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/ADD-COPY-with-JSON/Dockerfile
rename to builder/dockerfile/parser/testfiles/ADD-COPY-with-JSON/Dockerfile
diff --git a/builder/parser/testfiles/ADD-COPY-with-JSON/result b/builder/dockerfile/parser/testfiles/ADD-COPY-with-JSON/result
similarity index 100%
rename from builder/parser/testfiles/ADD-COPY-with-JSON/result
rename to builder/dockerfile/parser/testfiles/ADD-COPY-with-JSON/result
diff --git a/builder/parser/testfiles/brimstone-consuldock/Dockerfile b/builder/dockerfile/parser/testfiles/brimstone-consuldock/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/brimstone-consuldock/Dockerfile
rename to builder/dockerfile/parser/testfiles/brimstone-consuldock/Dockerfile
diff --git a/builder/parser/testfiles/brimstone-consuldock/result b/builder/dockerfile/parser/testfiles/brimstone-consuldock/result
similarity index 100%
rename from builder/parser/testfiles/brimstone-consuldock/result
rename to builder/dockerfile/parser/testfiles/brimstone-consuldock/result
diff --git a/builder/parser/testfiles/brimstone-docker-consul/Dockerfile b/builder/dockerfile/parser/testfiles/brimstone-docker-consul/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/brimstone-docker-consul/Dockerfile
rename to builder/dockerfile/parser/testfiles/brimstone-docker-consul/Dockerfile
diff --git a/builder/parser/testfiles/brimstone-docker-consul/result b/builder/dockerfile/parser/testfiles/brimstone-docker-consul/result
similarity index 100%
rename from builder/parser/testfiles/brimstone-docker-consul/result
rename to builder/dockerfile/parser/testfiles/brimstone-docker-consul/result
diff --git a/builder/parser/testfiles/continueIndent/Dockerfile b/builder/dockerfile/parser/testfiles/continueIndent/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/continueIndent/Dockerfile
rename to builder/dockerfile/parser/testfiles/continueIndent/Dockerfile
diff --git a/builder/parser/testfiles/continueIndent/result b/builder/dockerfile/parser/testfiles/continueIndent/result
similarity index 100%
rename from builder/parser/testfiles/continueIndent/result
rename to builder/dockerfile/parser/testfiles/continueIndent/result
diff --git a/builder/parser/testfiles/cpuguy83-nagios/Dockerfile b/builder/dockerfile/parser/testfiles/cpuguy83-nagios/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/cpuguy83-nagios/Dockerfile
rename to builder/dockerfile/parser/testfiles/cpuguy83-nagios/Dockerfile
diff --git a/builder/parser/testfiles/cpuguy83-nagios/result b/builder/dockerfile/parser/testfiles/cpuguy83-nagios/result
similarity index 100%
rename from builder/parser/testfiles/cpuguy83-nagios/result
rename to builder/dockerfile/parser/testfiles/cpuguy83-nagios/result
diff --git a/builder/parser/testfiles/docker/Dockerfile b/builder/dockerfile/parser/testfiles/docker/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/docker/Dockerfile
rename to builder/dockerfile/parser/testfiles/docker/Dockerfile
diff --git a/builder/parser/testfiles/docker/result b/builder/dockerfile/parser/testfiles/docker/result
similarity index 100%
rename from builder/parser/testfiles/docker/result
rename to builder/dockerfile/parser/testfiles/docker/result
diff --git a/builder/parser/testfiles/env/Dockerfile b/builder/dockerfile/parser/testfiles/env/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/env/Dockerfile
rename to builder/dockerfile/parser/testfiles/env/Dockerfile
diff --git a/builder/parser/testfiles/env/result b/builder/dockerfile/parser/testfiles/env/result
similarity index 100%
rename from builder/parser/testfiles/env/result
rename to builder/dockerfile/parser/testfiles/env/result
diff --git a/builder/parser/testfiles/escapes/Dockerfile b/builder/dockerfile/parser/testfiles/escapes/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/escapes/Dockerfile
rename to builder/dockerfile/parser/testfiles/escapes/Dockerfile
diff --git a/builder/parser/testfiles/escapes/result b/builder/dockerfile/parser/testfiles/escapes/result
similarity index 100%
rename from builder/parser/testfiles/escapes/result
rename to builder/dockerfile/parser/testfiles/escapes/result
diff --git a/builder/parser/testfiles/flags/Dockerfile b/builder/dockerfile/parser/testfiles/flags/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/flags/Dockerfile
rename to builder/dockerfile/parser/testfiles/flags/Dockerfile
diff --git a/builder/parser/testfiles/flags/result b/builder/dockerfile/parser/testfiles/flags/result
similarity index 100%
rename from builder/parser/testfiles/flags/result
rename to builder/dockerfile/parser/testfiles/flags/result
diff --git a/builder/parser/testfiles/influxdb/Dockerfile b/builder/dockerfile/parser/testfiles/influxdb/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/influxdb/Dockerfile
rename to builder/dockerfile/parser/testfiles/influxdb/Dockerfile
diff --git a/builder/parser/testfiles/influxdb/result b/builder/dockerfile/parser/testfiles/influxdb/result
similarity index 100%
rename from builder/parser/testfiles/influxdb/result
rename to builder/dockerfile/parser/testfiles/influxdb/result
diff --git a/builder/parser/testfiles/jeztah-invalid-json-json-inside-string-double/Dockerfile b/builder/dockerfile/parser/testfiles/jeztah-invalid-json-json-inside-string-double/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/jeztah-invalid-json-json-inside-string-double/Dockerfile
rename to builder/dockerfile/parser/testfiles/jeztah-invalid-json-json-inside-string-double/Dockerfile
diff --git a/builder/parser/testfiles/jeztah-invalid-json-json-inside-string-double/result b/builder/dockerfile/parser/testfiles/jeztah-invalid-json-json-inside-string-double/result
similarity index 100%
rename from builder/parser/testfiles/jeztah-invalid-json-json-inside-string-double/result
rename to builder/dockerfile/parser/testfiles/jeztah-invalid-json-json-inside-string-double/result
diff --git a/builder/parser/testfiles/jeztah-invalid-json-json-inside-string/Dockerfile b/builder/dockerfile/parser/testfiles/jeztah-invalid-json-json-inside-string/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/jeztah-invalid-json-json-inside-string/Dockerfile
rename to builder/dockerfile/parser/testfiles/jeztah-invalid-json-json-inside-string/Dockerfile
diff --git a/builder/parser/testfiles/jeztah-invalid-json-json-inside-string/result b/builder/dockerfile/parser/testfiles/jeztah-invalid-json-json-inside-string/result
similarity index 100%
rename from builder/parser/testfiles/jeztah-invalid-json-json-inside-string/result
rename to builder/dockerfile/parser/testfiles/jeztah-invalid-json-json-inside-string/result
diff --git a/builder/parser/testfiles/jeztah-invalid-json-single-quotes/Dockerfile b/builder/dockerfile/parser/testfiles/jeztah-invalid-json-single-quotes/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/jeztah-invalid-json-single-quotes/Dockerfile
rename to builder/dockerfile/parser/testfiles/jeztah-invalid-json-single-quotes/Dockerfile
diff --git a/builder/parser/testfiles/jeztah-invalid-json-single-quotes/result b/builder/dockerfile/parser/testfiles/jeztah-invalid-json-single-quotes/result
similarity index 100%
rename from builder/parser/testfiles/jeztah-invalid-json-single-quotes/result
rename to builder/dockerfile/parser/testfiles/jeztah-invalid-json-single-quotes/result
diff --git a/builder/parser/testfiles/jeztah-invalid-json-unterminated-bracket/Dockerfile b/builder/dockerfile/parser/testfiles/jeztah-invalid-json-unterminated-bracket/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/jeztah-invalid-json-unterminated-bracket/Dockerfile
rename to builder/dockerfile/parser/testfiles/jeztah-invalid-json-unterminated-bracket/Dockerfile
diff --git a/builder/parser/testfiles/jeztah-invalid-json-unterminated-bracket/result b/builder/dockerfile/parser/testfiles/jeztah-invalid-json-unterminated-bracket/result
similarity index 100%
rename from builder/parser/testfiles/jeztah-invalid-json-unterminated-bracket/result
rename to builder/dockerfile/parser/testfiles/jeztah-invalid-json-unterminated-bracket/result
diff --git a/builder/parser/testfiles/jeztah-invalid-json-unterminated-string/Dockerfile b/builder/dockerfile/parser/testfiles/jeztah-invalid-json-unterminated-string/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/jeztah-invalid-json-unterminated-string/Dockerfile
rename to builder/dockerfile/parser/testfiles/jeztah-invalid-json-unterminated-string/Dockerfile
diff --git a/builder/parser/testfiles/jeztah-invalid-json-unterminated-string/result b/builder/dockerfile/parser/testfiles/jeztah-invalid-json-unterminated-string/result
similarity index 100%
rename from builder/parser/testfiles/jeztah-invalid-json-unterminated-string/result
rename to builder/dockerfile/parser/testfiles/jeztah-invalid-json-unterminated-string/result
diff --git a/builder/parser/testfiles/json/Dockerfile b/builder/dockerfile/parser/testfiles/json/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/json/Dockerfile
rename to builder/dockerfile/parser/testfiles/json/Dockerfile
diff --git a/builder/parser/testfiles/json/result b/builder/dockerfile/parser/testfiles/json/result
similarity index 100%
rename from builder/parser/testfiles/json/result
rename to builder/dockerfile/parser/testfiles/json/result
diff --git a/builder/parser/testfiles/kartar-entrypoint-oddities/Dockerfile b/builder/dockerfile/parser/testfiles/kartar-entrypoint-oddities/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/kartar-entrypoint-oddities/Dockerfile
rename to builder/dockerfile/parser/testfiles/kartar-entrypoint-oddities/Dockerfile
diff --git a/builder/parser/testfiles/kartar-entrypoint-oddities/result b/builder/dockerfile/parser/testfiles/kartar-entrypoint-oddities/result
similarity index 100%
rename from builder/parser/testfiles/kartar-entrypoint-oddities/result
rename to builder/dockerfile/parser/testfiles/kartar-entrypoint-oddities/result
diff --git a/builder/parser/testfiles/lk4d4-the-edge-case-generator/Dockerfile b/builder/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/lk4d4-the-edge-case-generator/Dockerfile
rename to builder/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/Dockerfile
diff --git a/builder/parser/testfiles/lk4d4-the-edge-case-generator/result b/builder/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/result
similarity index 100%
rename from builder/parser/testfiles/lk4d4-the-edge-case-generator/result
rename to builder/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/result
diff --git a/builder/parser/testfiles/mail/Dockerfile b/builder/dockerfile/parser/testfiles/mail/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/mail/Dockerfile
rename to builder/dockerfile/parser/testfiles/mail/Dockerfile
diff --git a/builder/parser/testfiles/mail/result b/builder/dockerfile/parser/testfiles/mail/result
similarity index 100%
rename from builder/parser/testfiles/mail/result
rename to builder/dockerfile/parser/testfiles/mail/result
diff --git a/builder/parser/testfiles/multiple-volumes/Dockerfile b/builder/dockerfile/parser/testfiles/multiple-volumes/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/multiple-volumes/Dockerfile
rename to builder/dockerfile/parser/testfiles/multiple-volumes/Dockerfile
diff --git a/builder/parser/testfiles/multiple-volumes/result b/builder/dockerfile/parser/testfiles/multiple-volumes/result
similarity index 100%
rename from builder/parser/testfiles/multiple-volumes/result
rename to builder/dockerfile/parser/testfiles/multiple-volumes/result
diff --git a/builder/parser/testfiles/mumble/Dockerfile b/builder/dockerfile/parser/testfiles/mumble/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/mumble/Dockerfile
rename to builder/dockerfile/parser/testfiles/mumble/Dockerfile
diff --git a/builder/parser/testfiles/mumble/result b/builder/dockerfile/parser/testfiles/mumble/result
similarity index 100%
rename from builder/parser/testfiles/mumble/result
rename to builder/dockerfile/parser/testfiles/mumble/result
diff --git a/builder/parser/testfiles/nginx/Dockerfile b/builder/dockerfile/parser/testfiles/nginx/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/nginx/Dockerfile
rename to builder/dockerfile/parser/testfiles/nginx/Dockerfile
diff --git a/builder/parser/testfiles/nginx/result b/builder/dockerfile/parser/testfiles/nginx/result
similarity index 100%
rename from builder/parser/testfiles/nginx/result
rename to builder/dockerfile/parser/testfiles/nginx/result
diff --git a/builder/parser/testfiles/tf2/Dockerfile b/builder/dockerfile/parser/testfiles/tf2/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/tf2/Dockerfile
rename to builder/dockerfile/parser/testfiles/tf2/Dockerfile
diff --git a/builder/parser/testfiles/tf2/result b/builder/dockerfile/parser/testfiles/tf2/result
similarity index 100%
rename from builder/parser/testfiles/tf2/result
rename to builder/dockerfile/parser/testfiles/tf2/result
diff --git a/builder/parser/testfiles/weechat/Dockerfile b/builder/dockerfile/parser/testfiles/weechat/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/weechat/Dockerfile
rename to builder/dockerfile/parser/testfiles/weechat/Dockerfile
diff --git a/builder/parser/testfiles/weechat/result b/builder/dockerfile/parser/testfiles/weechat/result
similarity index 100%
rename from builder/parser/testfiles/weechat/result
rename to builder/dockerfile/parser/testfiles/weechat/result
diff --git a/builder/parser/testfiles/znc/Dockerfile b/builder/dockerfile/parser/testfiles/znc/Dockerfile
similarity index 100%
rename from builder/parser/testfiles/znc/Dockerfile
rename to builder/dockerfile/parser/testfiles/znc/Dockerfile
diff --git a/builder/parser/testfiles/znc/result b/builder/dockerfile/parser/testfiles/znc/result
similarity index 100%
rename from builder/parser/testfiles/znc/result
rename to builder/dockerfile/parser/testfiles/znc/result
diff --git a/builder/parser/utils.go b/builder/dockerfile/parser/utils.go
similarity index 100%
rename from builder/parser/utils.go
rename to builder/dockerfile/parser/utils.go
diff --git a/builder/shell_parser.go b/builder/dockerfile/shell_parser.go
similarity index 99%
rename from builder/shell_parser.go
rename to builder/dockerfile/shell_parser.go
index c2ffcc963a..7ef1773523 100644
--- a/builder/shell_parser.go
+++ b/builder/dockerfile/shell_parser.go
@@ -1,4 +1,4 @@
-package builder
+package dockerfile
 
 // This will take a single word and an array of env variables and
 // process all quotes (" and ') as well as $xxx and ${xxx} env variable
diff --git a/builder/shell_parser_test.go b/builder/dockerfile/shell_parser_test.go
similarity index 98%
rename from builder/shell_parser_test.go
rename to builder/dockerfile/shell_parser_test.go
index d0f445c313..6568e39418 100644
--- a/builder/shell_parser_test.go
+++ b/builder/dockerfile/shell_parser_test.go
@@ -1,4 +1,4 @@
-package builder
+package dockerfile
 
 import (
 	"bufio"
diff --git a/builder/support.go b/builder/dockerfile/support.go
similarity index 96%
rename from builder/support.go
rename to builder/dockerfile/support.go
index 4cc25dcb63..1d793b17f4 100644
--- a/builder/support.go
+++ b/builder/dockerfile/support.go
@@ -1,4 +1,4 @@
-package builder
+package dockerfile
 
 import (
 	"regexp"
diff --git a/builder/support_test.go b/builder/dockerfile/support_test.go
similarity index 97%
rename from builder/support_test.go
rename to builder/dockerfile/support_test.go
index 417e4f4478..05b44bae7b 100644
--- a/builder/support_test.go
+++ b/builder/dockerfile/support_test.go
@@ -1,4 +1,4 @@
-package builder
+package dockerfile
 
 import (
 	"fmt"
diff --git a/builder/words b/builder/dockerfile/words
similarity index 100%
rename from builder/words
rename to builder/dockerfile/words
diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go
index b7a166aad1..bfc53f72c6 100644
--- a/integration-cli/docker_cli_build_test.go
+++ b/integration-cli/docker_cli_build_test.go
@@ -18,7 +18,7 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/docker/docker/builder/command"
+	"github.com/docker/docker/builder/dockerfile/command"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/stringutils"
 	"github.com/go-check/check"