diff --git a/cmd/helm/create.go b/cmd/helm/create.go
index a4a09113ef217284bbb5d9c5d19f954510c0b81b..ffaa67d2c56115c15ea205157d5ac76422fbbb59 100644
--- a/cmd/helm/create.go
+++ b/cmd/helm/create.go
@@ -24,8 +24,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"k8s.io/helm/cmd/helm/helmpath"
 	"k8s.io/helm/pkg/chartutil"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/proto/hapi/chart"
 )
 
diff --git a/cmd/helm/dependency_build.go b/cmd/helm/dependency_build.go
index 9be3674a2718f1ac88ebbfc22f968fee80169622..8e8c73062d31ae82e8af4f7a06fd23041cdc7b9a 100644
--- a/cmd/helm/dependency_build.go
+++ b/cmd/helm/dependency_build.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"k8s.io/helm/cmd/helm/helmpath"
 	"k8s.io/helm/pkg/downloader"
+	"k8s.io/helm/pkg/helm/helmpath"
 )
 
 const dependencyBuildDesc = `
diff --git a/cmd/helm/dependency_build_test.go b/cmd/helm/dependency_build_test.go
index 361d3ed6ce00ae10e07af75e3fa08a8fe727cdd7..4dc170b9e99aa586ad08c69678a5a872e2a5733a 100644
--- a/cmd/helm/dependency_build_test.go
+++ b/cmd/helm/dependency_build_test.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"testing"
 
-	"k8s.io/helm/cmd/helm/helmpath"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/provenance"
 	"k8s.io/helm/pkg/repo"
 	"k8s.io/helm/pkg/repo/repotest"
diff --git a/cmd/helm/dependency_update.go b/cmd/helm/dependency_update.go
index 79490544433a6f6932a4efb51419e4c1020b8540..e361ae1c680270f841ea7696b314d619dd1a4f5f 100644
--- a/cmd/helm/dependency_update.go
+++ b/cmd/helm/dependency_update.go
@@ -20,8 +20,8 @@ import (
 	"path/filepath"
 
 	"github.com/spf13/cobra"
-	"k8s.io/helm/cmd/helm/helmpath"
 	"k8s.io/helm/pkg/downloader"
+	"k8s.io/helm/pkg/helm/helmpath"
 )
 
 const dependencyUpDesc = `
diff --git a/cmd/helm/dependency_update_test.go b/cmd/helm/dependency_update_test.go
index d64601d499008de9627bb14c0ff2ee5ddbffd301..c3b638a3f641631d5c630efbefe93264adb5e483 100644
--- a/cmd/helm/dependency_update_test.go
+++ b/cmd/helm/dependency_update_test.go
@@ -25,8 +25,8 @@ import (
 
 	"github.com/ghodss/yaml"
 
-	"k8s.io/helm/cmd/helm/helmpath"
 	"k8s.io/helm/pkg/chartutil"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/proto/hapi/chart"
 	"k8s.io/helm/pkg/provenance"
 	"k8s.io/helm/pkg/repo"
diff --git a/cmd/helm/fetch.go b/cmd/helm/fetch.go
index b4fd83142883bc1f52edb22b1d732968682276bf..b7e5d060c65cb2d983348bd0a78c41a43996086a 100644
--- a/cmd/helm/fetch.go
+++ b/cmd/helm/fetch.go
@@ -24,9 +24,9 @@ import (
 	"path/filepath"
 
 	"github.com/spf13/cobra"
-	"k8s.io/helm/cmd/helm/helmpath"
 	"k8s.io/helm/pkg/chartutil"
 	"k8s.io/helm/pkg/downloader"
+	"k8s.io/helm/pkg/helm/helmpath"
 )
 
 const fetchDesc = `
diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go
index 260821db1ab18cfec65b173296213cd991af3d68..64200adafb4c56c7645eb160b6c735cf72792d43 100644
--- a/cmd/helm/helm.go
+++ b/cmd/helm/helm.go
@@ -32,7 +32,7 @@ import (
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/client/restclient"
 
-	"k8s.io/helm/cmd/helm/helmpath"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/helm/portforwarder"
 	"k8s.io/helm/pkg/kube"
 	"k8s.io/helm/pkg/tiller/environment"
diff --git a/cmd/helm/helm_test.go b/cmd/helm/helm_test.go
index b0a5075a7a2cae2e0cd749f3f552843769b6962e..efc4fce397a051060ef708ad8c0f71c3611bac1d 100644
--- a/cmd/helm/helm_test.go
+++ b/cmd/helm/helm_test.go
@@ -29,8 +29,8 @@ import (
 	"github.com/golang/protobuf/ptypes/timestamp"
 	"github.com/spf13/cobra"
 
-	"k8s.io/helm/cmd/helm/helmpath"
 	"k8s.io/helm/pkg/helm"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/proto/hapi/chart"
 	"k8s.io/helm/pkg/proto/hapi/release"
 	rls "k8s.io/helm/pkg/proto/hapi/services"
diff --git a/cmd/helm/home.go b/cmd/helm/home.go
index 59344f075b953f1418de7405b10231e407bf0084..59e5538df3a53f36d40aff84f9fe97dc64c125a3 100644
--- a/cmd/helm/home.go
+++ b/cmd/helm/home.go
@@ -21,7 +21,7 @@ import (
 	"io"
 
 	"github.com/spf13/cobra"
-	"k8s.io/helm/cmd/helm/helmpath"
+	"k8s.io/helm/pkg/helm/helmpath"
 )
 
 var longHomeHelp = `
diff --git a/cmd/helm/init.go b/cmd/helm/init.go
index dd6b949e33200bad30c3f1a94115fa4828e836af..03edfe9d0dbd842e1c46df7a505ce3719f8d19de 100644
--- a/cmd/helm/init.go
+++ b/cmd/helm/init.go
@@ -26,8 +26,8 @@ import (
 	kerrors "k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 
-	"k8s.io/helm/cmd/helm/helmpath"
 	"k8s.io/helm/cmd/helm/installer"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/repo"
 )
 
diff --git a/cmd/helm/init_test.go b/cmd/helm/init_test.go
index 00870e23b3b2733648b1eac2f2cbae9e447f1776..00c754cfaedb4c120799c62a6c190c622a1c7c96 100644
--- a/cmd/helm/init_test.go
+++ b/cmd/helm/init_test.go
@@ -32,7 +32,7 @@ import (
 	testcore "k8s.io/kubernetes/pkg/client/testing/core"
 	"k8s.io/kubernetes/pkg/runtime"
 
-	"k8s.io/helm/cmd/helm/helmpath"
+	"k8s.io/helm/pkg/helm/helmpath"
 )
 
 func TestInitCmd(t *testing.T) {
diff --git a/cmd/helm/install.go b/cmd/helm/install.go
index 2e41a7972fbbff66e80562d8628c9cc7063b18dc..b475c79638f0cad12cb8be38ee53346f32c7aa42 100644
--- a/cmd/helm/install.go
+++ b/cmd/helm/install.go
@@ -32,11 +32,11 @@ import (
 	"github.com/ghodss/yaml"
 	"github.com/spf13/cobra"
 
-	"k8s.io/helm/cmd/helm/helmpath"
 	"k8s.io/helm/cmd/helm/strvals"
 	"k8s.io/helm/pkg/chartutil"
 	"k8s.io/helm/pkg/downloader"
 	"k8s.io/helm/pkg/helm"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/kube"
 	"k8s.io/helm/pkg/proto/hapi/chart"
 	"k8s.io/helm/pkg/proto/hapi/release"
diff --git a/cmd/helm/package.go b/cmd/helm/package.go
index d88fcf214630bca40768100de47cf3cb49cd7543..ac8ff9d8ea15c38e21842a21e2da72d6831e8af8 100644
--- a/cmd/helm/package.go
+++ b/cmd/helm/package.go
@@ -29,8 +29,8 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/crypto/ssh/terminal"
 
-	"k8s.io/helm/cmd/helm/helmpath"
 	"k8s.io/helm/pkg/chartutil"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/proto/hapi/chart"
 	"k8s.io/helm/pkg/provenance"
 	"k8s.io/helm/pkg/repo"
diff --git a/cmd/helm/package_test.go b/cmd/helm/package_test.go
index f72b1d25cd59b42fa73798a760d283574891f673..a9dc021a3f93f0f37ff1c491f9654589c88f72d5 100644
--- a/cmd/helm/package_test.go
+++ b/cmd/helm/package_test.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"k8s.io/helm/cmd/helm/helmpath"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/proto/hapi/chart"
 )
 
diff --git a/cmd/helm/plugins.go b/cmd/helm/plugins.go
index 6e308aed66faaa0c0eb6d3fd2fd5dc10c8ce3359..ba1df5565e66dc0964cd0e88772700b132518139 100644
--- a/cmd/helm/plugins.go
+++ b/cmd/helm/plugins.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"k8s.io/helm/cmd/helm/helmpath"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/plugin"
 )
 
diff --git a/cmd/helm/plugins_test.go b/cmd/helm/plugins_test.go
index f7cd178481918433cd9446cf543d0a8565765357..d1cb868ba065ce6fbbe44075f257c1cb8be81cec 100644
--- a/cmd/helm/plugins_test.go
+++ b/cmd/helm/plugins_test.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"testing"
 
-	"k8s.io/helm/cmd/helm/helmpath"
+	"k8s.io/helm/pkg/helm/helmpath"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/helm/repo_add.go b/cmd/helm/repo_add.go
index ec764ada991dbf6f5008dbed2307b68f5c33ce7d..523ac5ad1e0f3637f8b15f95cb1f83788bccecf9 100644
--- a/cmd/helm/repo_add.go
+++ b/cmd/helm/repo_add.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"k8s.io/helm/cmd/helm/helmpath"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/repo"
 )
 
diff --git a/cmd/helm/repo_add_test.go b/cmd/helm/repo_add_test.go
index 7c5342177a47b3940100ed03bbc65ad57d5eb196..9ca4dc5d4a62c16f6c9ce76afca67981bed3f323 100644
--- a/cmd/helm/repo_add_test.go
+++ b/cmd/helm/repo_add_test.go
@@ -21,7 +21,7 @@ import (
 	"os"
 	"testing"
 
-	"k8s.io/helm/cmd/helm/helmpath"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/repo"
 	"k8s.io/helm/pkg/repo/repotest"
 )
diff --git a/cmd/helm/repo_list.go b/cmd/helm/repo_list.go
index a3816facd78cf5c071764dee044963c4f1165c43..b9567df8cb4670e4cffa5bdaf7e116f7b43e2b27 100644
--- a/cmd/helm/repo_list.go
+++ b/cmd/helm/repo_list.go
@@ -24,7 +24,7 @@ import (
 	"github.com/gosuri/uitable"
 	"github.com/spf13/cobra"
 
-	"k8s.io/helm/cmd/helm/helmpath"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/repo"
 )
 
diff --git a/cmd/helm/repo_remove.go b/cmd/helm/repo_remove.go
index f7671cab010f48856281d2c7b333bd4b3e9d5d99..5b82bdc0a28caf57191af17b6682626b17fc8451 100644
--- a/cmd/helm/repo_remove.go
+++ b/cmd/helm/repo_remove.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"k8s.io/helm/cmd/helm/helmpath"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/repo"
 )
 
diff --git a/cmd/helm/repo_remove_test.go b/cmd/helm/repo_remove_test.go
index 12f534972658527e041e2dd4dd883c49f0e58bbc..3fb20a8211eda49f24e2148961574f5f95b254a2 100644
--- a/cmd/helm/repo_remove_test.go
+++ b/cmd/helm/repo_remove_test.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"testing"
 
-	"k8s.io/helm/cmd/helm/helmpath"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/repo"
 	"k8s.io/helm/pkg/repo/repotest"
 )
diff --git a/cmd/helm/repo_update.go b/cmd/helm/repo_update.go
index 8e564c98bb74ff574f776c4f28f2f102c04c5fce..881a1b7cab29dfd72c99fb2464f5d63c89cdbcd9 100644
--- a/cmd/helm/repo_update.go
+++ b/cmd/helm/repo_update.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"k8s.io/helm/cmd/helm/helmpath"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/repo"
 )
 
diff --git a/cmd/helm/repo_update_test.go b/cmd/helm/repo_update_test.go
index e32e92fbb21ca05b157eedb1f6d90306aa215f10..447a16a6ff93c786c71a3fb4128ca04ee6cf39b4 100644
--- a/cmd/helm/repo_update_test.go
+++ b/cmd/helm/repo_update_test.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"testing"
 
-	"k8s.io/helm/cmd/helm/helmpath"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/repo"
 	"k8s.io/helm/pkg/repo/repotest"
 )
diff --git a/cmd/helm/reset.go b/cmd/helm/reset.go
index a6c5d42bb0b430908d602dcdd2654c00272e73df..e826668021145c2c30b24ee431366f79f0392865 100644
--- a/cmd/helm/reset.go
+++ b/cmd/helm/reset.go
@@ -25,9 +25,9 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 
-	"k8s.io/helm/cmd/helm/helmpath"
 	"k8s.io/helm/cmd/helm/installer"
 	"k8s.io/helm/pkg/helm"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/kube"
 	"k8s.io/helm/pkg/proto/hapi/release"
 )
diff --git a/cmd/helm/reset_test.go b/cmd/helm/reset_test.go
index 42b7aebce57a58974c0ffecbe96f7c1566f428f7..0dde84eabc0dfc2e7e537ea0143cc7bd42bccaf2 100644
--- a/cmd/helm/reset_test.go
+++ b/cmd/helm/reset_test.go
@@ -26,7 +26,7 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
 
-	"k8s.io/helm/cmd/helm/helmpath"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/proto/hapi/release"
 )
 
diff --git a/cmd/helm/search.go b/cmd/helm/search.go
index a1d57adb0263afb4ce25322938ff4909d2ea90d8..d7fb2482f6fc2e63980263edf43bdb91e11b1a53 100644
--- a/cmd/helm/search.go
+++ b/cmd/helm/search.go
@@ -24,8 +24,8 @@ import (
 	"github.com/gosuri/uitable"
 	"github.com/spf13/cobra"
 
-	"k8s.io/helm/cmd/helm/helmpath"
 	"k8s.io/helm/cmd/helm/search"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/repo"
 )
 
diff --git a/cmd/helm/serve.go b/cmd/helm/serve.go
index 559b987b3899acfc4563ec4c2ad21535cd0330c4..4f78ed4b484f0c0301ea028558eecffc83b6e992 100644
--- a/cmd/helm/serve.go
+++ b/cmd/helm/serve.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"k8s.io/helm/cmd/helm/helmpath"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/repo"
 )
 
diff --git a/pkg/downloader/chart_downloader.go b/pkg/downloader/chart_downloader.go
index f5ca166a08d7f172496476300646826e015527a6..065df8b7548ddabbe63415f083a5e388a4729f7e 100644
--- a/pkg/downloader/chart_downloader.go
+++ b/pkg/downloader/chart_downloader.go
@@ -27,7 +27,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"k8s.io/helm/cmd/helm/helmpath"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/provenance"
 	"k8s.io/helm/pkg/repo"
 	"k8s.io/helm/pkg/urlutil"
diff --git a/pkg/downloader/chart_downloader_test.go b/pkg/downloader/chart_downloader_test.go
index e91035d54963a399c52f7e884f0e816e5abcb35f..9edcb98a36a300723c257aedf2e99dd1e9f9792a 100644
--- a/pkg/downloader/chart_downloader_test.go
+++ b/pkg/downloader/chart_downloader_test.go
@@ -25,7 +25,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"k8s.io/helm/cmd/helm/helmpath"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/repo"
 	"k8s.io/helm/pkg/repo/repotest"
 )
diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go
index a31895a0b9501f89227ba4ec51f385465bbf2e29..bf9b384fd5c95a730eb002ae37b027564e795e01 100644
--- a/pkg/downloader/manager.go
+++ b/pkg/downloader/manager.go
@@ -30,11 +30,8 @@ import (
 	"github.com/Masterminds/semver"
 	"github.com/ghodss/yaml"
 
-	// FIXME: This violates the package rules. A `cmd` should not be imported by
-	// something in 'pkg'
-	"k8s.io/helm/cmd/helm/helmpath"
-
 	"k8s.io/helm/pkg/chartutil"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/proto/hapi/chart"
 	"k8s.io/helm/pkg/repo"
 	"k8s.io/helm/pkg/resolver"
diff --git a/pkg/downloader/manager_test.go b/pkg/downloader/manager_test.go
index 4b15e6e0923624819adedd739684cb5d0eba23b7..2035676c4d4233efc1cecfa41f4c11f73cccfe49 100644
--- a/pkg/downloader/manager_test.go
+++ b/pkg/downloader/manager_test.go
@@ -20,8 +20,8 @@ import (
 	"reflect"
 	"testing"
 
-	"k8s.io/helm/cmd/helm/helmpath"
 	"k8s.io/helm/pkg/chartutil"
+	"k8s.io/helm/pkg/helm/helmpath"
 )
 
 func TestVersionEquals(t *testing.T) {
diff --git a/cmd/helm/helmpath/helmhome.go b/pkg/helm/helmpath/helmhome.go
similarity index 100%
rename from cmd/helm/helmpath/helmhome.go
rename to pkg/helm/helmpath/helmhome.go
diff --git a/cmd/helm/helmpath/helmhome_unix_test.go b/pkg/helm/helmpath/helmhome_unix_test.go
similarity index 100%
rename from cmd/helm/helmpath/helmhome_unix_test.go
rename to pkg/helm/helmpath/helmhome_unix_test.go
diff --git a/cmd/helm/helmpath/helmhome_windows_test.go b/pkg/helm/helmpath/helmhome_windows_test.go
similarity index 100%
rename from cmd/helm/helmpath/helmhome_windows_test.go
rename to pkg/helm/helmpath/helmhome_windows_test.go
diff --git a/pkg/repo/repotest/server.go b/pkg/repo/repotest/server.go
index 4bb1f57a98a41ae4b0638c70f0422f97f58e8a1a..1a0a270d7a9c624644b6b90fa0bb44422462155d 100644
--- a/pkg/repo/repotest/server.go
+++ b/pkg/repo/repotest/server.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/ghodss/yaml"
 
-	"k8s.io/helm/cmd/helm/helmpath"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/repo"
 )
 
diff --git a/pkg/resolver/resolver.go b/pkg/resolver/resolver.go
index b6654a8ac63332508c4dc256da831621c391c049..858ca272d8e5042113b28ed39041c8177d1fbc64 100644
--- a/pkg/resolver/resolver.go
+++ b/pkg/resolver/resolver.go
@@ -26,8 +26,8 @@ import (
 
 	"github.com/Masterminds/semver"
 
-	"k8s.io/helm/cmd/helm/helmpath"
 	"k8s.io/helm/pkg/chartutil"
+	"k8s.io/helm/pkg/helm/helmpath"
 	"k8s.io/helm/pkg/provenance"
 	"k8s.io/helm/pkg/repo"
 )