diff --git a/hack/import-restrictions.json b/hack/import-restrictions.json
index f78cfec6e352..55e042a39dc5 100644
--- a/hack/import-restrictions.json
+++ b/hack/import-restrictions.json
@@ -494,7 +494,9 @@
       "github.com/openshift/origin/pkg/template/client/v1",
       "github.com/openshift/origin/pkg/user/generated",
       "github.com/openshift/origin/pkg/security/generated",
-      "github.com/openshift/origin/pkg/template/generated"
+      "github.com/openshift/origin/pkg/template/generated",
+
+      "vendor/github.com/openshift/oc"
     ],
     "allowedImportPackages": [
       "github.com/openshift/origin/pkg/api/legacy",
@@ -530,7 +532,6 @@
       "github.com/openshift/origin/pkg/cmd/server/bootstrappolicy",
       "github.com/openshift/origin/pkg/cmd/templates",
       "github.com/openshift/origin/pkg/cmd/util",
-      "github.com/openshift/origin/pkg/cmd/util/term",
       "github.com/openshift/origin/pkg/image/apis/image",
       "github.com/openshift/origin/pkg/image/apis/image/v1/trigger",
       "github.com/openshift/origin/pkg/image/apis/image/docker10",
diff --git a/pkg/cmd/server/admin/decrypt.go b/pkg/cmd/server/admin/decrypt.go
index 6ed9db65e5e8..a0f4a8034e3c 100644
--- a/pkg/cmd/server/admin/decrypt.go
+++ b/pkg/cmd/server/admin/decrypt.go
@@ -8,7 +8,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/openshift/origin/pkg/cmd/util/term"
+	"github.com/openshift/oc/pkg/helpers/term"
 	"github.com/spf13/cobra"
 
 	"k8s.io/cli-runtime/pkg/genericclioptions"
diff --git a/pkg/cmd/server/admin/encrypt.go b/pkg/cmd/server/admin/encrypt.go
index 9fa8adec0322..10a1ed580a68 100644
--- a/pkg/cmd/server/admin/encrypt.go
+++ b/pkg/cmd/server/admin/encrypt.go
@@ -12,7 +12,7 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/openshift/origin/pkg/cmd/util/term"
+	"github.com/openshift/oc/pkg/helpers/term"
 	"github.com/spf13/cobra"
 
 	"k8s.io/cli-runtime/pkg/genericclioptions"
diff --git a/pkg/cmd/templates/templater.go b/pkg/cmd/templates/templater.go
index d2cb0d01513b..8b2c4ee31766 100644
--- a/pkg/cmd/templates/templater.go
+++ b/pkg/cmd/templates/templater.go
@@ -7,7 +7,7 @@ import (
 	"text/template"
 	"unicode"
 
-	"github.com/openshift/origin/pkg/cmd/util/term"
+	"github.com/openshift/oc/pkg/helpers/term"
 	ktemplates "k8s.io/kubernetes/pkg/kubectl/util/templates"
 
 	"github.com/spf13/cobra"
diff --git a/pkg/cmd/util/filepath.go b/pkg/cmd/util/filepath.go
index 52f36ec7a984..714a296a4b9b 100644
--- a/pkg/cmd/util/filepath.go
+++ b/pkg/cmd/util/filepath.go
@@ -2,25 +2,10 @@ package util
 
 import (
 	"fmt"
-	"os"
 	"path/filepath"
 	"strings"
 )
 
-func MakeAbs(path, base string) (string, error) {
-	if filepath.IsAbs(path) {
-		return path, nil
-	}
-	if len(base) == 0 {
-		cwd, err := os.Getwd()
-		if err != nil {
-			return "", err
-		}
-		base = cwd
-	}
-	return filepath.Join(base, path), nil
-}
-
 // ResolvePaths updates the given refs to be absolute paths, relative to the given base directory
 func ResolvePaths(refs []*string, base string) error {
 	for _, ref := range refs {
diff --git a/pkg/oc/cli/admin/prune/builds/resolvers.go b/pkg/oc/cli/admin/prune/builds/resolvers.go
index c2a2e01ed134..4dcb2266c264 100644
--- a/pkg/oc/cli/admin/prune/builds/resolvers.go
+++ b/pkg/oc/cli/admin/prune/builds/resolvers.go
@@ -6,7 +6,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 
 	buildv1 "github.com/openshift/api/build/v1"
-	"github.com/openshift/origin/pkg/oc/lib/buildapihelpers"
+	buildapihelpers "github.com/openshift/oc/pkg/helpers/build"
 )
 
 // Resolver knows how to resolve the set of candidate objects to prune
diff --git a/pkg/oc/cli/admin/prune/builds/resolvers_test.go b/pkg/oc/cli/admin/prune/builds/resolvers_test.go
index cdfede69234c..85e6db1f3c96 100644
--- a/pkg/oc/cli/admin/prune/builds/resolvers_test.go
+++ b/pkg/oc/cli/admin/prune/builds/resolvers_test.go
@@ -10,7 +10,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 
 	buildv1 "github.com/openshift/api/build/v1"
-	"github.com/openshift/origin/pkg/oc/lib/buildapihelpers"
+	buildapihelpers "github.com/openshift/oc/pkg/helpers/build"
 )
 
 type mockResolver struct {
diff --git a/pkg/oc/cli/cli.go b/pkg/oc/cli/cli.go
index 1e23378c1fba..99ba56f346ab 100644
--- a/pkg/oc/cli/cli.go
+++ b/pkg/oc/cli/cli.go
@@ -19,11 +19,11 @@ import (
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	ktemplates "k8s.io/kubernetes/pkg/kubectl/util/templates"
 
+	"github.com/openshift/oc/pkg/helpers/term"
 	"github.com/openshift/origin/pkg/cmd/flagtypes"
 	"github.com/openshift/origin/pkg/cmd/infra/deployer"
 	"github.com/openshift/origin/pkg/cmd/recycle"
 	"github.com/openshift/origin/pkg/cmd/templates"
-	"github.com/openshift/origin/pkg/cmd/util/term"
 	"github.com/openshift/origin/pkg/oc/cli/admin"
 	"github.com/openshift/origin/pkg/oc/cli/admin/buildchain"
 	sync "github.com/openshift/origin/pkg/oc/cli/admin/groups/sync"
diff --git a/pkg/oc/cli/create/imagestreamtag.go b/pkg/oc/cli/create/imagestreamtag.go
index 4ecb38a0319a..98dfffaf1873 100644
--- a/pkg/oc/cli/create/imagestreamtag.go
+++ b/pkg/oc/cli/create/imagestreamtag.go
@@ -15,7 +15,7 @@ import (
 	imagev1 "github.com/openshift/api/image/v1"
 	imagev1client "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
 	"github.com/openshift/library-go/pkg/image/reference"
-	utilenv "github.com/openshift/origin/pkg/oc/util/env"
+	utilenv "github.com/openshift/oc/pkg/helpers/env"
 )
 
 const ImageStreamTagRecommendedName = "imagestreamtag"
diff --git a/pkg/oc/cli/debug/debug.go b/pkg/oc/cli/debug/debug.go
index e32397d989cc..fae9d54efa6f 100644
--- a/pkg/oc/cli/debug/debug.go
+++ b/pkg/oc/cli/debug/debug.go
@@ -47,12 +47,12 @@ import (
 	appsv1client "github.com/openshift/client-go/apps/clientset/versioned/typed/apps/v1"
 	imagev1client "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
 	"github.com/openshift/library-go/pkg/image/reference"
+	"github.com/openshift/oc/pkg/helpers/conditions"
+	utilenv "github.com/openshift/oc/pkg/helpers/env"
 	appsutil "github.com/openshift/origin/pkg/apps/util"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	imageutil "github.com/openshift/origin/pkg/image/util"
-	"github.com/openshift/origin/pkg/oc/lib/conditions"
 	generateapp "github.com/openshift/origin/pkg/oc/lib/newapp/app"
-	utilenv "github.com/openshift/origin/pkg/oc/util/env"
 )
 
 const (
diff --git a/pkg/oc/cli/login/helpers.go b/pkg/oc/cli/login/helpers.go
index 91d23b217d05..8f222a66c452 100644
--- a/pkg/oc/cli/login/helpers.go
+++ b/pkg/oc/cli/login/helpers.go
@@ -15,7 +15,7 @@ import (
 	kclientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 	kterm "k8s.io/kubernetes/pkg/kubectl/util/term"
 
-	"github.com/openshift/origin/pkg/cmd/util/term"
+	"github.com/openshift/oc/pkg/helpers/term"
 )
 
 // getMatchingClusters examines the kubeconfig for all clusters that point to the same server
diff --git a/pkg/oc/cli/login/login.go b/pkg/oc/cli/login/login.go
index 21d906029cd9..500539d71709 100644
--- a/pkg/oc/cli/login/login.go
+++ b/pkg/oc/cli/login/login.go
@@ -16,8 +16,8 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/util/templates"
 	"k8s.io/kubernetes/pkg/kubectl/util/term"
 
+	kubeconfiglib "github.com/openshift/oc/pkg/helpers/kubeconfig"
 	"github.com/openshift/origin/pkg/cmd/flagtypes"
-	kubeconfiglib "github.com/openshift/origin/pkg/oc/lib/kubeconfig"
 )
 
 var (
diff --git a/pkg/oc/cli/login/loginoptions.go b/pkg/oc/cli/login/loginoptions.go
index d7066e43059a..32016cea82ae 100644
--- a/pkg/oc/cli/login/loginoptions.go
+++ b/pkg/oc/cli/login/loginoptions.go
@@ -21,14 +21,13 @@ import (
 
 	userv1 "github.com/openshift/api/user/v1"
 	projectv1typedclient "github.com/openshift/client-go/project/clientset/versioned/typed/project/v1"
+	"github.com/openshift/oc/pkg/helpers/errors"
+	cliconfig "github.com/openshift/oc/pkg/helpers/kubeconfig"
+	"github.com/openshift/oc/pkg/helpers/project"
+	loginutil "github.com/openshift/oc/pkg/helpers/project"
+	"github.com/openshift/oc/pkg/helpers/term"
 	"github.com/openshift/origin/pkg/client/config"
-	cmdutil "github.com/openshift/origin/pkg/cmd/util"
-	"github.com/openshift/origin/pkg/cmd/util/term"
-	"github.com/openshift/origin/pkg/oc/lib/errors"
-	cliconfig "github.com/openshift/origin/pkg/oc/lib/kubeconfig"
 	"github.com/openshift/origin/pkg/oc/lib/tokencmd"
-	"github.com/openshift/origin/pkg/oc/util/project"
-	loginutil "github.com/openshift/origin/pkg/oc/util/project"
 )
 
 const defaultClusterURL = "https://localhost:8443"
@@ -366,7 +365,7 @@ func (o *LoginOptions) SaveConfig() (bool, error) {
 	if err != nil {
 		return false, err
 	}
-	baseDir, err := cmdutil.MakeAbs(filepath.Dir(o.PathOptions.GetDefaultFilename()), cwd)
+	baseDir, err := kclientcmdapi.MakeAbs(filepath.Dir(o.PathOptions.GetDefaultFilename()), cwd)
 	if err != nil {
 		return false, err
 	}
diff --git a/pkg/oc/cli/logout/logout.go b/pkg/oc/cli/logout/logout.go
index 65f2d29fc979..07b8b5fd7657 100644
--- a/pkg/oc/cli/logout/logout.go
+++ b/pkg/oc/cli/logout/logout.go
@@ -16,8 +16,8 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/util/templates"
 
 	oauthv1client "github.com/openshift/client-go/oauth/clientset/versioned/typed/oauth/v1"
-	kubeconfiglib "github.com/openshift/origin/pkg/oc/lib/kubeconfig"
-	"github.com/openshift/origin/pkg/oc/util/project"
+	kubeconfiglib "github.com/openshift/oc/pkg/helpers/kubeconfig"
+	"github.com/openshift/oc/pkg/helpers/project"
 )
 
 type LogoutOptions struct {
diff --git a/pkg/oc/cli/logs/logs.go b/pkg/oc/cli/logs/logs.go
index b48f62c56ce2..4f1534970a28 100644
--- a/pkg/oc/cli/logs/logs.go
+++ b/pkg/oc/cli/logs/logs.go
@@ -20,8 +20,8 @@ import (
 	appsv1 "github.com/openshift/api/apps/v1"
 	buildv1 "github.com/openshift/api/build/v1"
 	buildv1client "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1"
+	ocbuildapihelpers "github.com/openshift/oc/pkg/helpers/build"
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
-	ocbuildapihelpers "github.com/openshift/origin/pkg/oc/lib/buildapihelpers"
 )
 
 // LogsRecommendedCommandName is the recommended command name
diff --git a/pkg/oc/cli/project/project.go b/pkg/oc/cli/project/project.go
index 4c4b45f274d0..37bff25a52b6 100644
--- a/pkg/oc/cli/project/project.go
+++ b/pkg/oc/cli/project/project.go
@@ -20,9 +20,9 @@ import (
 
 	projectv1 "github.com/openshift/api/project/v1"
 	projectv1client "github.com/openshift/client-go/project/clientset/versioned/typed/project/v1"
+	cliconfig "github.com/openshift/oc/pkg/helpers/kubeconfig"
 	oapi "github.com/openshift/origin/pkg/api"
 	clientcfg "github.com/openshift/origin/pkg/client/config"
-	cliconfig "github.com/openshift/origin/pkg/oc/lib/kubeconfig"
 )
 
 type ProjectOptions struct {
diff --git a/pkg/oc/cli/projects/projects.go b/pkg/oc/cli/projects/projects.go
index 14f3fb2055af..36a9d37028e8 100644
--- a/pkg/oc/cli/projects/projects.go
+++ b/pkg/oc/cli/projects/projects.go
@@ -17,10 +17,10 @@ import (
 
 	projectv1 "github.com/openshift/api/project/v1"
 	projectv1client "github.com/openshift/client-go/project/clientset/versioned/typed/project/v1"
+	cliconfig "github.com/openshift/oc/pkg/helpers/kubeconfig"
 	oapi "github.com/openshift/origin/pkg/api"
 	clientcfg "github.com/openshift/origin/pkg/client/config"
 	ocproject "github.com/openshift/origin/pkg/oc/cli/project"
-	cliconfig "github.com/openshift/origin/pkg/oc/lib/kubeconfig"
 )
 
 type ProjectsOptions struct {
diff --git a/pkg/oc/cli/requestproject/request_project.go b/pkg/oc/cli/requestproject/request_project.go
index ec2ee2e69ee9..0b08a3051066 100644
--- a/pkg/oc/cli/requestproject/request_project.go
+++ b/pkg/oc/cli/requestproject/request_project.go
@@ -13,8 +13,8 @@ import (
 
 	projectv1 "github.com/openshift/api/project/v1"
 	projectv1client "github.com/openshift/client-go/project/clientset/versioned/typed/project/v1"
+	cliconfig "github.com/openshift/oc/pkg/helpers/kubeconfig"
 	ocproject "github.com/openshift/origin/pkg/oc/cli/project"
-	cliconfig "github.com/openshift/origin/pkg/oc/lib/kubeconfig"
 )
 
 // RequestProjectOptions contains all the options for running the RequestProject cli command.
diff --git a/pkg/oc/cli/secrets/basicauth.go b/pkg/oc/cli/secrets/basicauth.go
index 9a1ba96dd916..7f46339c79db 100644
--- a/pkg/oc/cli/secrets/basicauth.go
+++ b/pkg/oc/cli/secrets/basicauth.go
@@ -16,7 +16,7 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/util/templates"
 	kterm "k8s.io/kubernetes/pkg/kubectl/util/term"
 
-	"github.com/openshift/origin/pkg/cmd/util/term"
+	"github.com/openshift/oc/pkg/helpers/term"
 )
 
 // CreateBasicAuthSecretRecommendedCommandName represents name of subcommand for `oc secrets` command
diff --git a/pkg/oc/cli/serviceaccounts/gettoken.go b/pkg/oc/cli/serviceaccounts/gettoken.go
index c220c8f36a89..406482b8e04c 100644
--- a/pkg/oc/cli/serviceaccounts/gettoken.go
+++ b/pkg/oc/cli/serviceaccounts/gettoken.go
@@ -14,7 +14,7 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/util/templates"
 	sautil "k8s.io/kubernetes/pkg/serviceaccount"
 
-	"github.com/openshift/origin/pkg/cmd/util/term"
+	"github.com/openshift/oc/pkg/helpers/term"
 )
 
 const (
diff --git a/pkg/oc/cli/serviceaccounts/newtoken.go b/pkg/oc/cli/serviceaccounts/newtoken.go
index 1a16ebdbdd9b..bba8d1ebe70e 100644
--- a/pkg/oc/cli/serviceaccounts/newtoken.go
+++ b/pkg/oc/cli/serviceaccounts/newtoken.go
@@ -21,7 +21,7 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/util/templates"
 	sautil "k8s.io/kubernetes/pkg/serviceaccount"
 
-	"github.com/openshift/origin/pkg/cmd/util/term"
+	"github.com/openshift/oc/pkg/helpers/term"
 	osautil "github.com/openshift/origin/pkg/oc/lib/serviceaccount"
 )
 
diff --git a/pkg/oc/cli/set/deploymenthook.go b/pkg/oc/cli/set/deploymenthook.go
index ed9788e98ff5..5293f6ac2637 100644
--- a/pkg/oc/cli/set/deploymenthook.go
+++ b/pkg/oc/cli/set/deploymenthook.go
@@ -19,8 +19,8 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/util/templates"
 
 	appsv1 "github.com/openshift/api/apps/v1"
+	utilenv "github.com/openshift/oc/pkg/helpers/env"
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
-	utilenv "github.com/openshift/origin/pkg/oc/util/env"
 )
 
 var (
diff --git a/pkg/oc/cli/set/env.go b/pkg/oc/cli/set/env.go
index 6826b756a3a5..8532ae22c66b 100644
--- a/pkg/oc/cli/set/env.go
+++ b/pkg/oc/cli/set/env.go
@@ -28,8 +28,8 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/util/templates"
 
 	buildv1 "github.com/openshift/api/build/v1"
+	utilenv "github.com/openshift/oc/pkg/helpers/env"
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
-	utilenv "github.com/openshift/origin/pkg/oc/util/env"
 	"github.com/openshift/origin/pkg/pod/envresolve"
 )
 
diff --git a/pkg/oc/cli/shim_kubectl.go b/pkg/oc/cli/shim_kubectl.go
index ff10b8cdb3cc..0a88145d638f 100644
--- a/pkg/oc/cli/shim_kubectl.go
+++ b/pkg/oc/cli/shim_kubectl.go
@@ -10,9 +10,9 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/generate/versioned"
 	"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
 
+	"github.com/openshift/oc/pkg/helpers/clientcmd"
 	"github.com/openshift/origin/pkg/api/legacygroupification"
 	"github.com/openshift/origin/pkg/oc/originpolymorphichelpers"
-	"github.com/openshift/origin/pkg/oc/util/clientcmd"
 	oversion "github.com/openshift/origin/pkg/version"
 )
 
diff --git a/pkg/oc/cli/startbuild/startbuild.go b/pkg/oc/cli/startbuild/startbuild.go
index b335781b024f..2fef30045109 100644
--- a/pkg/oc/cli/startbuild/startbuild.go
+++ b/pkg/oc/cli/startbuild/startbuild.go
@@ -40,11 +40,11 @@ import (
 	buildv1 "github.com/openshift/api/build/v1"
 	buildv1client "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1"
 	"github.com/openshift/library-go/pkg/git"
+	utilenv "github.com/openshift/oc/pkg/helpers/env"
+	ocerrors "github.com/openshift/oc/pkg/helpers/errors"
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
 	buildclientmanual "github.com/openshift/origin/pkg/build/client/v1"
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
-	ocerrors "github.com/openshift/origin/pkg/oc/lib/errors"
-	utilenv "github.com/openshift/origin/pkg/oc/util/env"
 )
 
 var (
diff --git a/pkg/oc/cli/status/status.go b/pkg/oc/cli/status/status.go
index a72e80d9937c..f9b662518e69 100644
--- a/pkg/oc/cli/status/status.go
+++ b/pkg/oc/cli/status/status.go
@@ -18,8 +18,8 @@ import (
 	imagev1client "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
 	projectv1client "github.com/openshift/client-go/project/clientset/versioned/typed/project/v1"
 	routev1client "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
+	loginutil "github.com/openshift/oc/pkg/helpers/project"
 	"github.com/openshift/origin/pkg/oc/lib/describe"
-	loginutil "github.com/openshift/origin/pkg/oc/util/project"
 	dotutil "github.com/openshift/origin/pkg/util/dot"
 )
 
diff --git a/pkg/oc/lib/buildapihelpers/sortinternal.go b/pkg/oc/lib/buildapihelpers/sortinternal.go
deleted file mode 100644
index 483e6eaed2a3..000000000000
--- a/pkg/oc/lib/buildapihelpers/sortinternal.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package buildapihelpers
-
-import (
-	buildapi "github.com/openshift/origin/pkg/build/apis/build"
-)
-
-// BuildSliceByCreationTimestampInternal implements sort.Interface for []Build
-// based on the CreationTimestamp field.
-type BuildSliceByCreationTimestampInternal []buildapi.Build
-
-func (b BuildSliceByCreationTimestampInternal) Len() int {
-	return len(b)
-}
-
-func (b BuildSliceByCreationTimestampInternal) Less(i, j int) bool {
-	return b[i].CreationTimestamp.Before(&b[j].CreationTimestamp)
-}
-
-func (b BuildSliceByCreationTimestampInternal) Swap(i, j int) {
-	b[i], b[j] = b[j], b[i]
-}
-
-// BuildPtrSliceByCreationTimestampInternal implements sort.Interface for []*Build
-// based on the CreationTimestamp field.
-type BuildPtrSliceByCreationTimestampInternal []*buildapi.Build
-
-func (b BuildPtrSliceByCreationTimestampInternal) Len() int {
-	return len(b)
-}
-
-func (b BuildPtrSliceByCreationTimestampInternal) Less(i, j int) bool {
-	return b[i].CreationTimestamp.Before(&b[j].CreationTimestamp)
-}
-
-func (b BuildPtrSliceByCreationTimestampInternal) Swap(i, j int) {
-	b[i], b[j] = b[j], b[i]
-}
diff --git a/pkg/oc/lib/describe/describer.go b/pkg/oc/lib/describe/describer.go
index 70907550eac4..ae74e8d5d600 100644
--- a/pkg/oc/lib/describe/describer.go
+++ b/pkg/oc/lib/describe/describer.go
@@ -46,6 +46,8 @@ import (
 	buildv1clienttyped "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1"
 	onetworktypedclient "github.com/openshift/client-go/network/clientset/versioned/typed/network/v1"
 	quotaclient "github.com/openshift/client-go/quota/clientset/versioned/typed/quota/v1"
+	ocbuildapihelpers "github.com/openshift/oc/pkg/helpers/build"
+	routedisplayhelpers "github.com/openshift/oc/pkg/helpers/route"
 	oapi "github.com/openshift/origin/pkg/api"
 	"github.com/openshift/origin/pkg/api/legacy"
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
@@ -56,8 +58,6 @@ import (
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	imageclient "github.com/openshift/origin/pkg/image/generated/internalclientset/typed/image/internalversion"
 	oauthclient "github.com/openshift/origin/pkg/oauth/generated/internalclientset/typed/oauth/internalversion"
-	ocbuildapihelpers "github.com/openshift/origin/pkg/oc/lib/buildapihelpers"
-	"github.com/openshift/origin/pkg/oc/lib/routedisplayhelpers"
 	projectapi "github.com/openshift/origin/pkg/project/apis/project"
 	projectclient "github.com/openshift/origin/pkg/project/generated/internalclientset/typed/project/internalversion"
 	quotaconvert "github.com/openshift/origin/pkg/quota/apis/quota"
diff --git a/pkg/oc/lib/describe/projectstatus.go b/pkg/oc/lib/describe/projectstatus.go
index 8ba57b4ed078..7df7a4fb1371 100644
--- a/pkg/oc/lib/describe/projectstatus.go
+++ b/pkg/oc/lib/describe/projectstatus.go
@@ -36,10 +36,11 @@ import (
 	imagev1client "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
 	projectv1client "github.com/openshift/client-go/project/clientset/versioned/typed/project/v1"
 	routev1client "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
+	loginerrors "github.com/openshift/oc/pkg/helpers/errors"
+	routedisplayhelpers "github.com/openshift/oc/pkg/helpers/route"
 	oapi "github.com/openshift/origin/pkg/api"
 	appsutil "github.com/openshift/origin/pkg/apps/util"
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
-	loginerrors "github.com/openshift/origin/pkg/oc/lib/errors"
 	appsedges "github.com/openshift/origin/pkg/oc/lib/graph/appsgraph"
 	appsanalysis "github.com/openshift/origin/pkg/oc/lib/graph/appsgraph/analysis"
 	appsgraph "github.com/openshift/origin/pkg/oc/lib/graph/appsgraph/nodes"
@@ -56,7 +57,6 @@ import (
 	routeedges "github.com/openshift/origin/pkg/oc/lib/graph/routegraph"
 	routeanalysis "github.com/openshift/origin/pkg/oc/lib/graph/routegraph/analysis"
 	routegraph "github.com/openshift/origin/pkg/oc/lib/graph/routegraph/nodes"
-	"github.com/openshift/origin/pkg/oc/lib/routedisplayhelpers"
 	"github.com/openshift/origin/pkg/util/errors"
 	"github.com/openshift/origin/pkg/util/parallel"
 )
diff --git a/pkg/oc/lib/doc.go b/pkg/oc/lib/doc.go
deleted file mode 100644
index 775687939aa1..000000000000
--- a/pkg/oc/lib/doc.go
+++ /dev/null
@@ -1,4 +0,0 @@
-// lib contains the logic of commands used by oc.  It should never depend on any CLI constructs like commands or flags
-// it should be entirely focused on runtime need.
-// We're starting with a coarse chop
-package lib
diff --git a/pkg/oc/lib/graph/routegraph/analysis/analysis.go b/pkg/oc/lib/graph/routegraph/analysis/analysis.go
index abe07f8addaf..63cdd0cfc766 100644
--- a/pkg/oc/lib/graph/routegraph/analysis/analysis.go
+++ b/pkg/oc/lib/graph/routegraph/analysis/analysis.go
@@ -9,11 +9,11 @@ import (
 	corev1 "k8s.io/api/core/v1"
 
 	routev1 "github.com/openshift/api/route/v1"
+	routedisplayhelpers "github.com/openshift/oc/pkg/helpers/route"
 	osgraph "github.com/openshift/origin/pkg/oc/lib/graph/genericgraph"
 	kubegraph "github.com/openshift/origin/pkg/oc/lib/graph/kubegraph/nodes"
 	routeedges "github.com/openshift/origin/pkg/oc/lib/graph/routegraph"
 	routegraph "github.com/openshift/origin/pkg/oc/lib/graph/routegraph/nodes"
-	"github.com/openshift/origin/pkg/oc/lib/routedisplayhelpers"
 )
 
 const (
diff --git a/pkg/oc/lib/kubeconfig/helpers.go b/pkg/oc/lib/kubeconfig/helpers.go
deleted file mode 100644
index 930dec44b7fc..000000000000
--- a/pkg/oc/lib/kubeconfig/helpers.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package kubeconfig
-
-import (
-	"github.com/openshift/origin/pkg/cmd/util"
-	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
-)
-
-// TODO should be moved upstream
-func RelativizeClientConfigPaths(cfg *clientcmdapi.Config, base string) (err error) {
-	for k, cluster := range cfg.Clusters {
-		if len(cluster.CertificateAuthority) > 0 {
-			if cluster.CertificateAuthority, err = util.MakeAbs(cluster.CertificateAuthority, ""); err != nil {
-				return err
-			}
-			if cluster.CertificateAuthority, err = util.MakeRelative(cluster.CertificateAuthority, base); err != nil {
-				return err
-			}
-			cfg.Clusters[k] = cluster
-		}
-	}
-	for k, authInfo := range cfg.AuthInfos {
-		if len(authInfo.ClientCertificate) > 0 {
-			if authInfo.ClientCertificate, err = util.MakeAbs(authInfo.ClientCertificate, ""); err != nil {
-				return err
-			}
-			if authInfo.ClientCertificate, err = util.MakeRelative(authInfo.ClientCertificate, base); err != nil {
-				return err
-			}
-		}
-		if len(authInfo.ClientKey) > 0 {
-			if authInfo.ClientKey, err = util.MakeAbs(authInfo.ClientKey, ""); err != nil {
-				return err
-			}
-			if authInfo.ClientKey, err = util.MakeRelative(authInfo.ClientKey, base); err != nil {
-				return err
-			}
-		}
-		cfg.AuthInfos[k] = authInfo
-	}
-	return nil
-}
diff --git a/pkg/oc/lib/newapp/cmd/newapp.go b/pkg/oc/lib/newapp/cmd/newapp.go
index f6256825a544..7b9a924631dc 100644
--- a/pkg/oc/lib/newapp/cmd/newapp.go
+++ b/pkg/oc/lib/newapp/cmd/newapp.go
@@ -32,6 +32,8 @@ import (
 	routev1typedclient "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
 	templatev1typedclient "github.com/openshift/client-go/template/clientset/versioned/typed/template/v1"
 	"github.com/openshift/library-go/pkg/image/reference"
+	"github.com/openshift/oc/pkg/helpers/env"
+	utilenv "github.com/openshift/oc/pkg/helpers/env"
 	ometa "github.com/openshift/origin/pkg/api/imagereferencemutators"
 	"github.com/openshift/origin/pkg/build/buildapihelpers"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
@@ -42,8 +44,6 @@ import (
 	"github.com/openshift/origin/pkg/oc/lib/newapp/dockerfile"
 	"github.com/openshift/origin/pkg/oc/lib/newapp/jenkinsfile"
 	"github.com/openshift/origin/pkg/oc/lib/newapp/source"
-	"github.com/openshift/origin/pkg/oc/util/env"
-	utilenv "github.com/openshift/origin/pkg/oc/util/env"
 	templateclientv1 "github.com/openshift/origin/pkg/template/client/v1"
 	outil "github.com/openshift/origin/pkg/util"
 )
diff --git a/pkg/oc/lib/tokencmd/basicauth.go b/pkg/oc/lib/tokencmd/basicauth.go
index b80bc7bf3757..c033f10a9bfa 100644
--- a/pkg/oc/lib/tokencmd/basicauth.go
+++ b/pkg/oc/lib/tokencmd/basicauth.go
@@ -11,7 +11,7 @@ import (
 
 	"k8s.io/klog"
 
-	"github.com/openshift/origin/pkg/cmd/util/term"
+	"github.com/openshift/oc/pkg/helpers/term"
 )
 
 type BasicChallengeHandler struct {
diff --git a/pkg/oc/lib/tokencmd/negotiator_sspi.go b/pkg/oc/lib/tokencmd/negotiator_sspi.go
index b5bcf7758972..6840d3a75664 100644
--- a/pkg/oc/lib/tokencmd/negotiator_sspi.go
+++ b/pkg/oc/lib/tokencmd/negotiator_sspi.go
@@ -12,7 +12,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/runtime"
 
-	"github.com/openshift/origin/pkg/cmd/util/term"
+	"github.com/openshift/oc/pkg/helpers/term"
 
 	"github.com/alexbrainman/sspi"
 	"github.com/alexbrainman/sspi/negotiate"
diff --git a/pkg/oc/originpolymorphichelpers/logsforobject.go b/pkg/oc/originpolymorphichelpers/logsforobject.go
index 2ca8cf899303..15c2e6b67594 100644
--- a/pkg/oc/originpolymorphichelpers/logsforobject.go
+++ b/pkg/oc/originpolymorphichelpers/logsforobject.go
@@ -16,9 +16,9 @@ import (
 	buildv1 "github.com/openshift/api/build/v1"
 	appsv1client "github.com/openshift/client-go/apps/clientset/versioned/typed/apps/v1"
 	buildv1client "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1"
+	ocbuildapihelpers "github.com/openshift/oc/pkg/helpers/build"
 	appsmanualclientv1 "github.com/openshift/origin/pkg/apps/client/v1"
 	buildmanualclientv1 "github.com/openshift/origin/pkg/build/client/v1"
-	ocbuildapihelpers "github.com/openshift/origin/pkg/oc/lib/buildapihelpers"
 )
 
 func NewLogsForObjectFn(delegate polymorphichelpers.LogsForObjectFunc) polymorphichelpers.LogsForObjectFunc {
diff --git a/staging/src/github.com/openshift/oc/OWNERS b/staging/src/github.com/openshift/oc/OWNERS
new file mode 100644
index 000000000000..0409a265c55f
--- /dev/null
+++ b/staging/src/github.com/openshift/oc/OWNERS
@@ -0,0 +1,10 @@
+reviewers:
+  - deads2k
+  - mfojtik
+  - smarterclayton
+  - soltysh
+approvers:
+  - deads2k
+  - mfojtik
+  - smarterclayton
+  - soltysh
diff --git a/staging/src/github.com/openshift/oc/README.md b/staging/src/github.com/openshift/oc/README.md
new file mode 100644
index 000000000000..875b41d96781
--- /dev/null
+++ b/staging/src/github.com/openshift/oc/README.md
@@ -0,0 +1 @@
+### TODO: ADD README.md here
diff --git a/staging/src/github.com/openshift/oc/pkg/helpers/build/constants.go b/staging/src/github.com/openshift/oc/pkg/helpers/build/constants.go
new file mode 100644
index 000000000000..cb017916978f
--- /dev/null
+++ b/staging/src/github.com/openshift/oc/pkg/helpers/build/constants.go
@@ -0,0 +1,10 @@
+package build
+
+const (
+	// BuildConfigAnnotation is an annotation that identifies the BuildConfig that a Build was created from
+	BuildConfigAnnotation = "openshift.io/build-config.name"
+	// BuildConfigLabel is the key of a Build label whose value is the ID of a BuildConfig
+	// on which the Build is based. NOTE: The value for this label may not contain the entire
+	// BuildConfig name because it will be truncated to maximum label length.
+	BuildConfigLabel = "openshift.io/build-config.name"
+)
diff --git a/pkg/oc/lib/buildapihelpers/helpers.go b/staging/src/github.com/openshift/oc/pkg/helpers/build/helpers.go
similarity index 83%
rename from pkg/oc/lib/buildapihelpers/helpers.go
rename to staging/src/github.com/openshift/oc/pkg/helpers/build/helpers.go
index 7a4be1999692..19e8e3f73789 100644
--- a/pkg/oc/lib/buildapihelpers/helpers.go
+++ b/staging/src/github.com/openshift/oc/pkg/helpers/build/helpers.go
@@ -1,10 +1,9 @@
-package buildapihelpers
+package build
 
 import (
 	"fmt"
 
 	buildv1 "github.com/openshift/api/build/v1"
-	buildapi "github.com/openshift/origin/pkg/build/apis/build"
 )
 
 // PredicateFunc is testing an argument and decides does it meet some criteria or not.
@@ -29,8 +28,8 @@ func FilterBuilds(builds []buildv1.Build, predicate PredicateFunc) []buildv1.Bui
 // ByBuildConfigPredicate matches all builds that have build config annotation or label with specified value.
 func ByBuildConfigPredicate(labelValue string) PredicateFunc {
 	return func(arg interface{}) bool {
-		return hasBuildConfigAnnotation(arg.(buildv1.Build), buildapi.BuildConfigAnnotation, labelValue) ||
-			hasBuildConfigLabel(arg.(buildv1.Build), buildapi.BuildConfigLabel, labelValue)
+		return hasBuildConfigAnnotation(arg.(buildv1.Build), BuildConfigAnnotation, labelValue) ||
+			hasBuildConfigLabel(arg.(buildv1.Build), BuildConfigLabel, labelValue)
 	}
 }
 
diff --git a/pkg/oc/lib/buildapihelpers/helpers_test.go b/staging/src/github.com/openshift/oc/pkg/helpers/build/helpers_test.go
similarity index 92%
rename from pkg/oc/lib/buildapihelpers/helpers_test.go
rename to staging/src/github.com/openshift/oc/pkg/helpers/build/helpers_test.go
index 6c79ea69a42a..eaa08aa78897 100644
--- a/pkg/oc/lib/buildapihelpers/helpers_test.go
+++ b/staging/src/github.com/openshift/oc/pkg/helpers/build/helpers_test.go
@@ -1,4 +1,4 @@
-package buildapihelpers
+package build
 
 import (
 	"reflect"
@@ -8,7 +8,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	buildv1 "github.com/openshift/api/build/v1"
-	buildapi "github.com/openshift/origin/pkg/build/apis/build"
 )
 
 func TestFilterBuilds_withEmptyArray(t *testing.T) {
@@ -72,7 +71,7 @@ func TestByBuildConfigPredicate_withBuildConfigAnnotation(t *testing.T) {
 		{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:        "build1-abc",
-				Annotations: map[string]string{buildapi.BuildConfigAnnotation: "foo"},
+				Annotations: map[string]string{BuildConfigAnnotation: "foo"},
 			},
 		},
 		{
@@ -97,7 +96,7 @@ func TestByBuildConfigPredicate_withBuildConfigLabel(t *testing.T) {
 		{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:   "build1-abc",
-				Labels: map[string]string{buildapi.BuildConfigLabel: "foo"},
+				Labels: map[string]string{BuildConfigLabel: "foo"},
 			},
 		},
 		{
@@ -122,7 +121,7 @@ func TestByBuildConfigPredicate_withBothBuildConfigLabels(t *testing.T) {
 		{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:   "build1-abc",
-				Labels: map[string]string{buildapi.BuildConfigLabel: "foo"},
+				Labels: map[string]string{BuildConfigLabel: "foo"},
 			},
 		},
 		{
diff --git a/pkg/oc/lib/buildapihelpers/sort.go b/staging/src/github.com/openshift/oc/pkg/helpers/build/sort.go
similarity index 97%
rename from pkg/oc/lib/buildapihelpers/sort.go
rename to staging/src/github.com/openshift/oc/pkg/helpers/build/sort.go
index d7c8227ef99f..c17ea9754a5c 100644
--- a/pkg/oc/lib/buildapihelpers/sort.go
+++ b/staging/src/github.com/openshift/oc/pkg/helpers/build/sort.go
@@ -1,4 +1,4 @@
-package buildapihelpers
+package build
 
 import (
 	buildv1 "github.com/openshift/api/build/v1"
diff --git a/pkg/oc/lib/buildapihelpers/sort_test.go b/staging/src/github.com/openshift/oc/pkg/helpers/build/sort_test.go
similarity index 98%
rename from pkg/oc/lib/buildapihelpers/sort_test.go
rename to staging/src/github.com/openshift/oc/pkg/helpers/build/sort_test.go
index 05704a0b2f28..bc86430873d9 100644
--- a/pkg/oc/lib/buildapihelpers/sort_test.go
+++ b/staging/src/github.com/openshift/oc/pkg/helpers/build/sort_test.go
@@ -1,4 +1,4 @@
-package buildapihelpers
+package build
 
 import (
 	"sort"
diff --git a/pkg/oc/util/clientcmd/resolve.go b/staging/src/github.com/openshift/oc/pkg/helpers/clientcmd/resolve.go
similarity index 100%
rename from pkg/oc/util/clientcmd/resolve.go
rename to staging/src/github.com/openshift/oc/pkg/helpers/clientcmd/resolve.go
diff --git a/pkg/oc/util/clientcmd/resolve_test.go b/staging/src/github.com/openshift/oc/pkg/helpers/clientcmd/resolve_test.go
similarity index 100%
rename from pkg/oc/util/clientcmd/resolve_test.go
rename to staging/src/github.com/openshift/oc/pkg/helpers/clientcmd/resolve_test.go
diff --git a/pkg/oc/lib/conditions/conditions.go b/staging/src/github.com/openshift/oc/pkg/helpers/conditions/conditions.go
similarity index 100%
rename from pkg/oc/lib/conditions/conditions.go
rename to staging/src/github.com/openshift/oc/pkg/helpers/conditions/conditions.go
diff --git a/staging/src/github.com/openshift/oc/pkg/helpers/doc.go b/staging/src/github.com/openshift/oc/pkg/helpers/doc.go
new file mode 100644
index 000000000000..535885fc12b5
--- /dev/null
+++ b/staging/src/github.com/openshift/oc/pkg/helpers/doc.go
@@ -0,0 +1,4 @@
+// helpers contains the logic of commands used by oc.  It should never depend on any CLI constructs like commands or flags
+// it should be entirely focused on runtime need.
+// We're starting with a coarse chop
+package helpers
diff --git a/pkg/oc/util/env/env.go b/staging/src/github.com/openshift/oc/pkg/helpers/env/env.go
similarity index 100%
rename from pkg/oc/util/env/env.go
rename to staging/src/github.com/openshift/oc/pkg/helpers/env/env.go
diff --git a/pkg/oc/lib/errors/errors.go b/staging/src/github.com/openshift/oc/pkg/helpers/errors/errors.go
similarity index 100%
rename from pkg/oc/lib/errors/errors.go
rename to staging/src/github.com/openshift/oc/pkg/helpers/errors/errors.go
diff --git a/pkg/oc/lib/errors/login.go b/staging/src/github.com/openshift/oc/pkg/helpers/errors/login.go
similarity index 100%
rename from pkg/oc/lib/errors/login.go
rename to staging/src/github.com/openshift/oc/pkg/helpers/errors/login.go
diff --git a/staging/src/github.com/openshift/oc/pkg/helpers/kubeconfig/helpers.go b/staging/src/github.com/openshift/oc/pkg/helpers/kubeconfig/helpers.go
new file mode 100644
index 000000000000..a98c348c2ff9
--- /dev/null
+++ b/staging/src/github.com/openshift/oc/pkg/helpers/kubeconfig/helpers.go
@@ -0,0 +1,54 @@
+package kubeconfig
+
+import (
+	"path/filepath"
+
+	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
+)
+
+// TODO should be moved upstream
+func RelativizeClientConfigPaths(cfg *clientcmdapi.Config, base string) (err error) {
+	for k, cluster := range cfg.Clusters {
+		if len(cluster.CertificateAuthority) > 0 {
+			if cluster.CertificateAuthority, err = clientcmdapi.MakeAbs(cluster.CertificateAuthority, ""); err != nil {
+				return err
+			}
+			if cluster.CertificateAuthority, err = MakeRelative(cluster.CertificateAuthority, base); err != nil {
+				return err
+			}
+			cfg.Clusters[k] = cluster
+		}
+	}
+	for k, authInfo := range cfg.AuthInfos {
+		if len(authInfo.ClientCertificate) > 0 {
+			if authInfo.ClientCertificate, err = clientcmdapi.MakeAbs(authInfo.ClientCertificate, ""); err != nil {
+				return err
+			}
+			if authInfo.ClientCertificate, err = MakeRelative(authInfo.ClientCertificate, base); err != nil {
+				return err
+			}
+		}
+		if len(authInfo.ClientKey) > 0 {
+			if authInfo.ClientKey, err = clientcmdapi.MakeAbs(authInfo.ClientKey, ""); err != nil {
+				return err
+			}
+			if authInfo.ClientKey, err = MakeRelative(authInfo.ClientKey, base); err != nil {
+				return err
+			}
+		}
+		cfg.AuthInfos[k] = authInfo
+	}
+	return nil
+}
+
+// TODO should use library-go's version or even better upstream above
+func MakeRelative(path, base string) (string, error) {
+	if len(path) > 0 {
+		rel, err := filepath.Rel(base, path)
+		if err != nil {
+			return path, err
+		}
+		return rel, nil
+	}
+	return path, nil
+}
diff --git a/pkg/oc/lib/kubeconfig/loader.go b/staging/src/github.com/openshift/oc/pkg/helpers/kubeconfig/loader.go
similarity index 100%
rename from pkg/oc/lib/kubeconfig/loader.go
rename to staging/src/github.com/openshift/oc/pkg/helpers/kubeconfig/loader.go
diff --git a/pkg/oc/lib/kubeconfig/smart_merge.go b/staging/src/github.com/openshift/oc/pkg/helpers/kubeconfig/smart_merge.go
similarity index 93%
rename from pkg/oc/lib/kubeconfig/smart_merge.go
rename to staging/src/github.com/openshift/oc/pkg/helpers/kubeconfig/smart_merge.go
index b1606f8dde79..18a3735dd96f 100644
--- a/pkg/oc/lib/kubeconfig/smart_merge.go
+++ b/staging/src/github.com/openshift/oc/pkg/helpers/kubeconfig/smart_merge.go
@@ -1,20 +1,30 @@
 package kubeconfig
 
 import (
+	"net/url"
 	"reflect"
+	"strings"
 
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/third_party/forked/golang/netutil"
 	restclient "k8s.io/client-go/rest"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 
 	userv1typedclient "github.com/openshift/client-go/user/clientset/versioned/typed/user/v1"
-	"github.com/openshift/origin/pkg/client/config"
 )
 
 // getClusterNicknameFromConfig returns host:port of the clientConfig.Host, with .'s replaced by -'s
+// TODO this is copied from pkg/client/config/smart_merge.go, looks like a good library-go candidate
 func getClusterNicknameFromConfig(clientCfg *restclient.Config) (string, error) {
-	return config.GetClusterNicknameFromURL(clientCfg.Host)
+	u, err := url.Parse(clientCfg.Host)
+	if err != nil {
+		return "", err
+	}
+	hostPort := netutil.CanonicalAddr(u)
+
+	// we need a character other than "." to avoid conflicts with.  replace with '-'
+	return strings.Replace(hostPort, ".", "-", -1), nil
 }
 
 // getUserNicknameFromConfig returns "username(as known by the server)/getClusterNicknameFromConfig".  This allows tab completion for switching users to
diff --git a/pkg/oc/util/project/util.go b/staging/src/github.com/openshift/oc/pkg/helpers/project/util.go
similarity index 100%
rename from pkg/oc/util/project/util.go
rename to staging/src/github.com/openshift/oc/pkg/helpers/project/util.go
diff --git a/pkg/oc/util/project/whoami.go b/staging/src/github.com/openshift/oc/pkg/helpers/project/whoami.go
similarity index 100%
rename from pkg/oc/util/project/whoami.go
rename to staging/src/github.com/openshift/oc/pkg/helpers/project/whoami.go
diff --git a/pkg/oc/lib/routedisplayhelpers/status.go b/staging/src/github.com/openshift/oc/pkg/helpers/route/status.go
similarity index 94%
rename from pkg/oc/lib/routedisplayhelpers/status.go
rename to staging/src/github.com/openshift/oc/pkg/helpers/route/status.go
index b40027ce86b1..e76baf7a4520 100644
--- a/pkg/oc/lib/routedisplayhelpers/status.go
+++ b/staging/src/github.com/openshift/oc/pkg/helpers/route/status.go
@@ -1,4 +1,4 @@
-package routedisplayhelpers
+package route
 
 import (
 	corev1 "k8s.io/api/core/v1"
diff --git a/pkg/cmd/util/term/terminal.go b/staging/src/github.com/openshift/oc/pkg/helpers/term/terminal.go
similarity index 100%
rename from pkg/cmd/util/term/terminal.go
rename to staging/src/github.com/openshift/oc/pkg/helpers/term/terminal.go
diff --git a/pkg/cmd/util/term/terminal_test.go b/staging/src/github.com/openshift/oc/pkg/helpers/term/terminal_test.go
similarity index 100%
rename from pkg/cmd/util/term/terminal_test.go
rename to staging/src/github.com/openshift/oc/pkg/helpers/term/terminal_test.go
diff --git a/pkg/cmd/util/term/terminal_writer.go b/staging/src/github.com/openshift/oc/pkg/helpers/term/terminal_writer.go
similarity index 100%
rename from pkg/cmd/util/term/terminal_writer.go
rename to staging/src/github.com/openshift/oc/pkg/helpers/term/terminal_writer.go
diff --git a/pkg/cmd/util/term/terminal_writer_test.go b/staging/src/github.com/openshift/oc/pkg/helpers/term/terminal_writer_test.go
similarity index 100%
rename from pkg/cmd/util/term/terminal_writer_test.go
rename to staging/src/github.com/openshift/oc/pkg/helpers/term/terminal_writer_test.go
diff --git a/test/extended/router/scoped.go b/test/extended/router/scoped.go
index 21fc1fd85086..09b147edff34 100644
--- a/test/extended/router/scoped.go
+++ b/test/extended/router/scoped.go
@@ -17,7 +17,7 @@ import (
 
 	routev1 "github.com/openshift/api/route/v1"
 	routeclientset "github.com/openshift/client-go/route/clientset/versioned"
-	"github.com/openshift/origin/pkg/oc/lib/routedisplayhelpers"
+	routedisplayhelpers "github.com/openshift/oc/pkg/helpers/route"
 	routeapi "github.com/openshift/origin/pkg/route/apis/route"
 	routev1conversions "github.com/openshift/origin/pkg/route/apis/route/v1"
 	exutil "github.com/openshift/origin/test/extended/util"
diff --git a/test/extended/util/cli.go b/test/extended/util/cli.go
index 5a0f62d04aa6..86d5ceb7052f 100644
--- a/test/extended/util/cli.go
+++ b/test/extended/util/cli.go
@@ -41,12 +41,12 @@ import (
 	imagev1client "github.com/openshift/client-go/image/clientset/versioned"
 	operatorv1client "github.com/openshift/client-go/operator/clientset/versioned"
 	templateclient "github.com/openshift/client-go/template/clientset/versioned"
+	"github.com/openshift/oc/pkg/helpers/kubeconfig"
 	_ "github.com/openshift/origin/pkg/api/install"
 	authorizationclientset "github.com/openshift/origin/pkg/authorization/generated/internalclientset"
 	configapi "github.com/openshift/origin/pkg/cmd/server/apis/config"
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
 	imageclientset "github.com/openshift/origin/pkg/image/generated/internalclientset"
-	"github.com/openshift/origin/pkg/oc/lib/kubeconfig"
 	projectapi "github.com/openshift/origin/pkg/project/apis/project"
 	projectclientset "github.com/openshift/origin/pkg/project/generated/internalclientset"
 	routeclientset "github.com/openshift/origin/pkg/route/generated/internalclientset"
diff --git a/vendor/github.com/openshift/oc b/vendor/github.com/openshift/oc
new file mode 120000
index 000000000000..28e818682400
--- /dev/null
+++ b/vendor/github.com/openshift/oc
@@ -0,0 +1 @@
+../../../staging/src/github.com/openshift/oc
\ No newline at end of file