Skip kn subpackage

cmd/kn/main.go

@@ -22,9 +22,9 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"knative.dev/client/pkg/kn/config"
+	"knative.dev/client/pkg/config"
-	pluginpkg "knative.dev/client/pkg/kn/plugin"
+	pluginpkg "knative.dev/client/pkg/plugin"
-	"knative.dev/client/pkg/kn/root"
+	"knative.dev/client/pkg/root"
 )
 
 func main() {

cmd/kn/main_test.go

@@ -21,14 +21,14 @@ import (
 	"strings"
 	"testing"
 
-	pluginpkg "knative.dev/client/pkg/kn/plugin"
+	"knative.dev/client/pkg/config"
+	pluginpkg "knative.dev/client/pkg/plugin"
 
 	"github.com/spf13/cobra"
 	"gotest.tools/v3/assert"
 
 	"knative.dev/client/lib/test"
-	"knative.dev/client/pkg/kn/config"
+	"knative.dev/client/pkg/root"
-	"knative.dev/client/pkg/kn/root"
 	"knative.dev/client/pkg/util"
 )
 

hack/generate-docs.go

@@ -20,7 +20,7 @@ import (
 	"os"
 
 	"github.com/spf13/cobra/doc"
-	"knative.dev/client/pkg/kn/root"
+	"knative.dev/client/pkg/root"
 )
 
 func main() {

pkg/commands/broker/broker.go

@@ -19,7 +19,7 @@ package broker
 import (
 	"github.com/spf13/cobra"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 )
 
 // NewBrokerCommand represents broker management commands

pkg/commands/broker/broker_test.go

@@ -26,8 +26,8 @@ import (
 	duckv1 "knative.dev/pkg/apis/duck/v1"
 	servingv1 "knative.dev/serving/pkg/apis/serving/v1"
 
+	"knative.dev/client/pkg/commands"
 	clientv1beta1 "knative.dev/client/pkg/eventing/v1"
-	"knative.dev/client/pkg/kn/commands"
 	v1beta1 "knative.dev/eventing/pkg/apis/eventing/v1"
 )
 

pkg/commands/broker/create.go

@@ -24,8 +24,8 @@ import (
 	v1 "knative.dev/eventing/pkg/apis/duck/v1"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
 
+	"knative.dev/client/pkg/commands"
 	clientv1beta1 "knative.dev/client/pkg/eventing/v1"
-	"knative.dev/client/pkg/kn/commands"
 )
 
 var createExample = `

pkg/commands/broker/delete.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 )
 
 var deleteExample = `

pkg/commands/broker/delivery_option_flags.go

@@ -18,8 +18,8 @@ import (
 	"reflect"
 
 	"github.com/spf13/cobra"
+	"knative.dev/client/pkg/commands/flags"
 	"knative.dev/client/pkg/dynamic"
-	"knative.dev/client/pkg/kn/commands/flags"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
 )
 

pkg/commands/broker/describe.go

@@ -28,7 +28,7 @@ import (
 
 	v1beta1 "knative.dev/eventing/pkg/apis/eventing/v1"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	"knative.dev/client/pkg/printers"
 )
 

pkg/commands/broker/list.go

@@ -26,8 +26,8 @@ import (
 	metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
-	"knative.dev/client/pkg/kn/commands/flags"
+	"knative.dev/client/pkg/commands/flags"
 	hprinters "knative.dev/client/pkg/printers"
 	eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1"
 )

pkg/commands/broker/update.go

@@ -25,7 +25,7 @@ import (
 	v1 "knative.dev/client/pkg/eventing/v1"
 	duckv1 "knative.dev/eventing/pkg/apis/duck/v1"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1"
 )
 

pkg/commands/channel/channel.go

@@ -18,7 +18,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"k8s.io/client-go/tools/clientcmd"
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	messagingv1 "knative.dev/client/pkg/messaging/v1"
 	clientv1beta1 "knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1"
 )

pkg/commands/channel/channel_test.go

@@ -24,7 +24,7 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	clientv1beta1 "knative.dev/client/pkg/messaging/v1"
 	eventingduck "knative.dev/eventing/pkg/apis/duck/v1"
 )

pkg/commands/channel/create.go

@@ -20,9 +20,9 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"knative.dev/client/pkg/commands"
 	knerrors "knative.dev/client/pkg/errors"
-	"knative.dev/client/pkg/kn/commands"
+	knflags "knative.dev/client/pkg/flags"
-	knflags "knative.dev/client/pkg/kn/flags"
 	knmessagingv1 "knative.dev/client/pkg/messaging/v1"
 )
 

pkg/commands/channel/delete.go

@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 )
 
 // NewChannelDeleteCommand is for deleting a Channel

pkg/commands/channel/describe.go

@@ -24,8 +24,8 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1"
 
+	"knative.dev/client/pkg/commands"
 	knerrors "knative.dev/client/pkg/errors"
-	"knative.dev/client/pkg/kn/commands"
 	"knative.dev/client/pkg/printers"
 )
 

pkg/commands/channel/flags.go

@@ -22,7 +22,7 @@ import (
 	metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	"knative.dev/client/pkg/printers"
 	hprinters "knative.dev/client/pkg/printers"
 

pkg/commands/channel/list.go

@@ -21,8 +21,8 @@ import (
 	messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1"
 
 	"github.com/spf13/cobra"
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
-	"knative.dev/client/pkg/kn/commands/flags"
+	"knative.dev/client/pkg/commands/flags"
 	"knative.dev/eventing/pkg/client/clientset/versioned/scheme"
 )
 

pkg/commands/channel/list_types.go

@@ -21,10 +21,10 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"knative.dev/client/pkg/commands"
+	"knative.dev/client/pkg/commands/flags"
 	"knative.dev/client/pkg/dynamic"
 	knerrors "knative.dev/client/pkg/errors"
-	"knative.dev/client/pkg/kn/commands"
-	"knative.dev/client/pkg/kn/commands/flags"
 	messagingv1 "knative.dev/client/pkg/messaging/v1"
 )
 

pkg/commands/channel/list_types_test.go

@@ -29,8 +29,8 @@ import (
 
 	dynamicfakeClient "knative.dev/client/pkg/dynamic/fake"
 
+	"knative.dev/client/pkg/commands"
 	clientdynamic "knative.dev/client/pkg/dynamic"
-	"knative.dev/client/pkg/kn/commands"
 	"knative.dev/client/pkg/util"
 	"knative.dev/eventing/pkg/apis/messaging"
 )

pkg/commands/completion/completion.go

@@ -18,7 +18,7 @@ import (
 	"errors"
 	"os"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 
 	"github.com/spf13/cobra"
 )

pkg/commands/completion/completion_test.go

@@ -18,7 +18,7 @@ import (
 	"testing"
 
 	"knative.dev/client/lib/test"
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	"knative.dev/client/pkg/util"
 
 	"github.com/spf13/cobra"

pkg/commands/container/add.go

@@ -21,8 +21,8 @@ import (
 	"github.com/spf13/cobra"
 
 	corev1 "k8s.io/api/core/v1"
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
-	knflags "knative.dev/client/pkg/kn/flags"
+	knflags "knative.dev/client/pkg/flags"
 	sigyaml "sigs.k8s.io/yaml"
 )
 

pkg/commands/container/container.go

@@ -16,7 +16,7 @@ package container
 
 import (
 	"github.com/spf13/cobra"
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 )
 
 // NewContainerCommand to manage containers

pkg/commands/container/container_test.go

@@ -19,7 +19,7 @@ import (
 	"testing"
 
 	"gotest.tools/v3/assert"
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 )
 
 func TestContainerCommand(t *testing.T) {

pkg/commands/domain/create.go

@@ -21,8 +21,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"k8s.io/apimachinery/pkg/util/validation"
+	"knative.dev/client/pkg/commands"
 	knerrors "knative.dev/client/pkg/errors"
-	"knative.dev/client/pkg/kn/commands"
 	clientv1beta1 "knative.dev/client/pkg/serving/v1beta1"
 )
 

pkg/commands/domain/delete.go

@@ -20,8 +20,8 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"knative.dev/client/pkg/commands"
 	knerrors "knative.dev/client/pkg/errors"
-	"knative.dev/client/pkg/kn/commands"
 )
 
 // NewDomainMappingDeleteCommand to create event channels

pkg/commands/domain/describe.go

@@ -23,7 +23,7 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	"knative.dev/client/pkg/printers"
 	"knative.dev/serving/pkg/apis/serving/v1beta1"
 )

pkg/commands/domain/domain.go

@@ -22,8 +22,8 @@ import (
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"knative.dev/client/pkg/commands"
 	clientdynamic "knative.dev/client/pkg/dynamic"
-	"knative.dev/client/pkg/kn/commands"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
 )
 

pkg/commands/domain/domain_test.go

@@ -26,10 +26,10 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/clientcmd"
 
+	"knative.dev/client/pkg/commands"
 	kndynamic "knative.dev/client/pkg/dynamic"
 	dynamicfake "knative.dev/client/pkg/dynamic/fake"
-	"knative.dev/client/pkg/kn/commands"
+	knflags "knative.dev/client/pkg/flags"
-	knflags "knative.dev/client/pkg/kn/flags"
 	clientservingv1beta1 "knative.dev/client/pkg/serving/v1beta1"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
 	servingv1 "knative.dev/serving/pkg/apis/serving/v1"

pkg/commands/domain/human_readable_flags.go

@@ -19,7 +19,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"knative.dev/serving/pkg/apis/serving/v1beta1"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	hprinters "knative.dev/client/pkg/printers"
 )
 

pkg/commands/domain/list.go

@@ -19,8 +19,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
-	"knative.dev/client/pkg/kn/commands/flags"
+	"knative.dev/client/pkg/commands/flags"
 )
 
 // NewDomainMappingListCommand represents 'kn revision list' command

pkg/commands/domain/update.go

@@ -23,8 +23,8 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"knative.dev/client/pkg/commands"
 	knerrors "knative.dev/client/pkg/errors"
-	"knative.dev/client/pkg/kn/commands"
 )
 
 // NewDomainMappingUpdateCommand to create event channels

pkg/commands/eventtype/create.go

@@ -21,9 +21,9 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
+	"knative.dev/client/pkg/commands"
+	knflags "knative.dev/client/pkg/commands/flags"
 	clienteventingv1beta2 "knative.dev/client/pkg/eventing/v1beta2"
-	"knative.dev/client/pkg/kn/commands"
-	knflags "knative.dev/client/pkg/kn/commands/flags"
 	"knative.dev/pkg/apis"
 )
 

pkg/commands/eventtype/delete.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 )
 
 var deleteExample = `

pkg/commands/eventtype/describe.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"knative.dev/eventing/pkg/apis/eventing/v1beta2"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	"knative.dev/client/pkg/printers"
 )
 

pkg/commands/eventtype/eventtype.go

@@ -20,7 +20,7 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 )
 
 // NewEventTypeCommand represents event type management commands

pkg/commands/eventtype/eventtype_test.go

@@ -22,8 +22,8 @@ import (
 	kndynamic "knative.dev/client/pkg/dynamic"
 
 	"k8s.io/client-go/tools/clientcmd"
+	"knative.dev/client/pkg/commands"
 	"knative.dev/client/pkg/eventing/v1beta2"
-	"knative.dev/client/pkg/kn/commands"
 	eventingv1beta2 "knative.dev/eventing/pkg/apis/eventing/v1beta2"
 	"knative.dev/pkg/apis"
 )

pkg/commands/eventtype/list.go

@@ -24,8 +24,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
-	"knative.dev/client/pkg/kn/commands/flags"
+	"knative.dev/client/pkg/commands/flags"
 	hprinters "knative.dev/client/pkg/printers"
 	eventingv1beta2 "knative.dev/eventing/pkg/apis/eventing/v1beta2"
 )

pkg/commands/flags/listprint.go

@@ -21,7 +21,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	hprinters "knative.dev/client/pkg/printers"
 	"knative.dev/client/pkg/util"
 )

pkg/commands/flags/sink.go

@@ -22,11 +22,11 @@ import (
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"knative.dev/client/pkg/config"
 	"knative.dev/pkg/apis"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
 
 	clientdynamic "knative.dev/client/pkg/dynamic"
-	"knative.dev/client/pkg/kn/config"
 )
 
 type SinkFlags struct {

pkg/commands/plugin/list.go

@@ -20,10 +20,10 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
+	"knative.dev/client/pkg/config"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
-	"knative.dev/client/pkg/kn/config"
+	"knative.dev/client/pkg/plugin"
-	"knative.dev/client/pkg/kn/plugin"
 )
 
 // ValidPluginFilenamePrefixes controls the prefix for all kn plugins

pkg/commands/plugin/list_test.go

@@ -22,8 +22,8 @@ import (
 	"strings"
 	"testing"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
-	"knative.dev/client/pkg/kn/config"
+	config2 "knative.dev/client/pkg/config"
 	"knative.dev/client/pkg/util"
 
 	"github.com/spf13/cobra"
@@ -135,8 +135,8 @@ func prepareTestSetup(t *testing.T, args ...interface{}) (string, func()) {
 	tmpPathDir := t.TempDir()
 
 	// Prepare configuration to for our test
-	oldConfig := config.GlobalConfig
+	oldConfig := config2.GlobalConfig
-	config.GlobalConfig = &config.TestConfig{
+	config2.GlobalConfig = &config2.TestConfig{
 		TestPluginsDir:          tmpPathDir,
 		TestLookupPluginsInPath: false,
 	}
@@ -148,7 +148,7 @@ func prepareTestSetup(t *testing.T, args ...interface{}) (string, func()) {
 	}
 
 	return tmpPathDir, func() {
-		config.GlobalConfig = oldConfig
+		config2.GlobalConfig = oldConfig
 	}
 }
 

pkg/commands/plugin/plugin.go

@@ -17,7 +17,7 @@ package plugin
 import (
 	"github.com/spf13/cobra"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 )
 
 func NewPluginCommand(p *commands.KnParams) *cobra.Command {

pkg/commands/plugin/plugin_test.go

@@ -19,7 +19,7 @@ import (
 
 	"gotest.tools/v3/assert"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	"knative.dev/client/pkg/util"
 )
 

pkg/commands/revision/delete.go

@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	v1 "knative.dev/client/pkg/serving/v1"
 	servingv1 "knative.dev/serving/pkg/apis/serving/v1"
 )

pkg/commands/revision/delete_test.go

@@ -24,7 +24,7 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 	clienttesting "k8s.io/client-go/testing"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	"knative.dev/client/pkg/util"
 	"knative.dev/client/pkg/wait"
 	servingv1 "knative.dev/serving/pkg/apis/serving/v1"

pkg/commands/revision/describe.go

@@ -28,7 +28,7 @@ import (
 	"knative.dev/serving/pkg/apis/serving"
 	servingv1 "knative.dev/serving/pkg/apis/serving/v1"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	"knative.dev/client/pkg/printers"
 	clientserving "knative.dev/client/pkg/serving"
 )

pkg/commands/revision/describe_test.go

@@ -34,7 +34,7 @@ import (
 	servingv1 "knative.dev/serving/pkg/apis/serving/v1"
 	"sigs.k8s.io/yaml"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	"knative.dev/client/pkg/util"
 )
 

pkg/commands/revision/human_readable_flags.go

@@ -20,7 +20,7 @@ import (
 	"knative.dev/serving/pkg/apis/serving"
 	servingv1 "knative.dev/serving/pkg/apis/serving/v1"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	hprinters "knative.dev/client/pkg/printers"
 )
 

pkg/commands/revision/list.go

@@ -26,8 +26,8 @@ import (
 	"github.com/spf13/cobra"
 	servingv1 "knative.dev/serving/pkg/apis/serving/v1"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
-	"knative.dev/client/pkg/kn/commands/flags"
+	"knative.dev/client/pkg/commands/flags"
 	clientservingv1 "knative.dev/client/pkg/serving/v1"
 )
 

pkg/commands/revision/list_test.go

@@ -25,7 +25,7 @@ import (
 	"knative.dev/serving/pkg/apis/serving"
 	servingv1 "knative.dev/serving/pkg/apis/serving/v1"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	"knative.dev/client/pkg/util"
 )
 

pkg/commands/revision/revision.go

@@ -18,7 +18,7 @@ import (
 	"github.com/spf13/cobra"
 	servingv1 "knative.dev/serving/pkg/apis/serving/v1"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 )
 
 func NewRevisionCommand(p *commands.KnParams) *cobra.Command {

pkg/commands/revision/revision_test.go

@@ -22,10 +22,10 @@ import (
 	"github.com/spf13/cobra"
 	"gotest.tools/v3/assert"
 	"k8s.io/client-go/tools/clientcmd"
-	knflags "knative.dev/client/pkg/kn/flags"
+	knflags "knative.dev/client/pkg/flags"
 	servingv1 "knative.dev/serving/pkg/apis/serving/v1"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	clientservingv1 "knative.dev/client/pkg/serving/v1"
 	"knative.dev/client/pkg/util"
 )

pkg/commands/route/describe.go

@@ -23,7 +23,7 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	servingv1 "knative.dev/serving/pkg/apis/serving/v1"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	"knative.dev/client/pkg/printers"
 )
 

pkg/commands/route/describe_test.go

@@ -27,7 +27,7 @@ import (
 	servingv1 "knative.dev/serving/pkg/apis/serving/v1"
 	"sigs.k8s.io/yaml"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	"knative.dev/client/pkg/util"
 	"knative.dev/pkg/ptr"
 )

pkg/commands/route/human_readable_flags.go

@@ -19,7 +19,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	servingv1 "knative.dev/serving/pkg/apis/serving/v1"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	hprinters "knative.dev/client/pkg/printers"
 )
 

pkg/commands/route/list.go

@@ -18,13 +18,13 @@ import (
 	"errors"
 	"fmt"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	clientservingv1 "knative.dev/client/pkg/serving/v1"
 
 	"github.com/spf13/cobra"
 	servingv1 "knative.dev/serving/pkg/apis/serving/v1"
 
-	"knative.dev/client/pkg/kn/commands/flags"
+	"knative.dev/client/pkg/commands/flags"
 )
 
 // NewrouteListCommand represents 'kn route list' command

pkg/commands/route/list_test.go

@@ -25,7 +25,7 @@ import (
 	"knative.dev/pkg/ptr"
 	servingv1 "knative.dev/serving/pkg/apis/serving/v1"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 	"knative.dev/client/pkg/util"
 )
 

pkg/commands/route/route.go

@@ -17,7 +17,7 @@ package route
 import (
 	"github.com/spf13/cobra"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 )
 
 func NewRouteCommand(p *commands.KnParams) *cobra.Command {

pkg/commands/secret/create.go

@@ -24,7 +24,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"knative.dev/client/pkg/util"
 
-	"knative.dev/client/pkg/kn/commands"
+	"knative.dev/client/pkg/commands"
 )
 
 func NewSecretCreateCommand(p *commands.KnParams) *cobra.Command {