diff --git a/cmd/helm/root_test.go b/cmd/helm/root_test.go
index 81f8d65e2..b6280b813 100644
--- a/cmd/helm/root_test.go
+++ b/cmd/helm/root_test.go
@@ -17,7 +17,7 @@ limitations under the License.
 package main
 
 import (
-	"k8s.io/helm/pkg/helm/helmpath"
+	"k8s.io/helm/pkg/helm/environment"
 	"os"
 	"testing"
 )
@@ -32,7 +32,7 @@ func TestRootCmd(t *testing.T) {
 		{
 			name: "defaults",
 			args: "home",
-			home: helmpath.GetDefaultConfigHome(),
+			home: environment.GetDefaultConfigHome(),
 		},
 		{
 			name: "with --home set",
diff --git a/pkg/helm/helmpath/default_home_dir.go b/pkg/helm/environment/default_home_dir.go
similarity index 98%
rename from pkg/helm/helmpath/default_home_dir.go
rename to pkg/helm/environment/default_home_dir.go
index 8f4c685d2..3f9202ff0 100644
--- a/pkg/helm/helmpath/default_home_dir.go
+++ b/pkg/helm/environment/default_home_dir.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package helmpath
+package environment
 
 import (
 	"github.com/casimir/xdg-go"
diff --git a/pkg/helm/helmpath/default_helm_home_dir_test.go b/pkg/helm/environment/default_home_dir_test.go
similarity index 98%
rename from pkg/helm/helmpath/default_helm_home_dir_test.go
rename to pkg/helm/environment/default_home_dir_test.go
index c593f54d1..e8dcefd8d 100644
--- a/pkg/helm/helmpath/default_helm_home_dir_test.go
+++ b/pkg/helm/environment/default_home_dir_test.go
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package helmpath
+package environment
 
 import (
 	"runtime"
diff --git a/pkg/helm/environment/environment.go b/pkg/helm/environment/environment.go
index b90e3b7bc..9f4e855a6 100644
--- a/pkg/helm/environment/environment.go
+++ b/pkg/helm/environment/environment.go
@@ -48,7 +48,7 @@ func (s *EnvSettings) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&s.KubeConfig, "kubeconfig", "", "path to the kubeconfig file")
 	fs.StringVar(&s.KubeContext, "kube-context", "", "name of the kubeconfig context to use")
 	fs.BoolVar(&s.Debug, "debug", false, "enable verbose output")
-	fs.StringVar((*string)(&s.Home), "home", helmpath.GetDefaultConfigHome(), "location of your Helm config. Overrides $HELM_HOME")
+	fs.StringVar((*string)(&s.Home), "home", GetDefaultConfigHome(), "location of your Helm config. Overrides $HELM_HOME")
 }
 
 // Init sets values from the environment.
diff --git a/pkg/helm/environment/environment_test.go b/pkg/helm/environment/environment_test.go
index 3af9d8c29..a2be6a960 100644
--- a/pkg/helm/environment/environment_test.go
+++ b/pkg/helm/environment/environment_test.go
@@ -40,8 +40,8 @@ func TestEnvSettings(t *testing.T) {
 	}{
 		{
 			name:    "defaults",
-			home:    helmpath.GetDefaultConfigHome(),
-			plugins: helmpath.Home(helmpath.GetDefaultConfigHome()).Plugins(),
+			home:    GetDefaultConfigHome(),
+			plugins: helmpath.Home(GetDefaultConfigHome()).Plugins(),
 			ns:      "",
 		},
 		{