diff --git a/cns/singletenantcontroller/conversion.go b/cns/kubecontroller/nodenetworkconfig/conversion.go
similarity index 99%
rename from cns/singletenantcontroller/conversion.go
rename to cns/kubecontroller/nodenetworkconfig/conversion.go
index f8f8df32fb..0bfd6f1688 100644
--- a/cns/singletenantcontroller/conversion.go
+++ b/cns/kubecontroller/nodenetworkconfig/conversion.go
@@ -1,4 +1,4 @@
-package kubecontroller
+package nodenetworkconfig
 
 import (
 	"net"
diff --git a/cns/singletenantcontroller/conversion_test.go b/cns/kubecontroller/nodenetworkconfig/conversion_test.go
similarity index 99%
rename from cns/singletenantcontroller/conversion_test.go
rename to cns/kubecontroller/nodenetworkconfig/conversion_test.go
index e6ce30f722..a21d5d7f5b 100644
--- a/cns/singletenantcontroller/conversion_test.go
+++ b/cns/kubecontroller/nodenetworkconfig/conversion_test.go
@@ -1,4 +1,4 @@
-package kubecontroller
+package nodenetworkconfig
 
 import (
 	"strconv"
diff --git a/cns/singletenantcontroller/metrics.go b/cns/kubecontroller/nodenetworkconfig/metrics.go
similarity index 95%
rename from cns/singletenantcontroller/metrics.go
rename to cns/kubecontroller/nodenetworkconfig/metrics.go
index 9108f87408..a1ca124b6e 100644
--- a/cns/singletenantcontroller/metrics.go
+++ b/cns/kubecontroller/nodenetworkconfig/metrics.go
@@ -1,4 +1,4 @@
-package kubecontroller
+package nodenetworkconfig
 
 import (
 	"github.com/prometheus/client_golang/prometheus"
diff --git a/cns/singletenantcontroller/reconciler.go b/cns/kubecontroller/nodenetworkconfig/reconciler.go
similarity index 99%
rename from cns/singletenantcontroller/reconciler.go
rename to cns/kubecontroller/nodenetworkconfig/reconciler.go
index 8cfcee5b88..36788bacfb 100644
--- a/cns/singletenantcontroller/reconciler.go
+++ b/cns/kubecontroller/nodenetworkconfig/reconciler.go
@@ -1,4 +1,4 @@
-package kubecontroller
+package nodenetworkconfig
 
 import (
 	"context"
diff --git a/cns/singletenantcontroller/reconciler_test.go b/cns/kubecontroller/nodenetworkconfig/reconciler_test.go
similarity index 99%
rename from cns/singletenantcontroller/reconciler_test.go
rename to cns/kubecontroller/nodenetworkconfig/reconciler_test.go
index bb5619417f..82a9a76e4b 100644
--- a/cns/singletenantcontroller/reconciler_test.go
+++ b/cns/kubecontroller/nodenetworkconfig/reconciler_test.go
@@ -1,4 +1,4 @@
-package kubecontroller
+package nodenetworkconfig
 
 import (
 	"context"
diff --git a/cns/singletenantcontroller/scopedclient.go b/cns/kubecontroller/nodenetworkconfig/scopedclient.go
similarity index 98%
rename from cns/singletenantcontroller/scopedclient.go
rename to cns/kubecontroller/nodenetworkconfig/scopedclient.go
index b124dda5b8..85a9729bcb 100644
--- a/cns/singletenantcontroller/scopedclient.go
+++ b/cns/kubecontroller/nodenetworkconfig/scopedclient.go
@@ -1,4 +1,4 @@
-package kubecontroller
+package nodenetworkconfig
 
 import (
 	"context"
diff --git a/cns/service/main.go b/cns/service/main.go
index 589eaa7ae1..97c129176c 100644
--- a/cns/service/main.go
+++ b/cns/service/main.go
@@ -29,12 +29,12 @@ import (
 	"github.com/Azure/azure-container-networking/cns/healthserver"
 	"github.com/Azure/azure-container-networking/cns/hnsclient"
 	"github.com/Azure/azure-container-networking/cns/ipampool"
+	nncctrl "github.com/Azure/azure-container-networking/cns/kubecontroller/nodenetworkconfig"
 	"github.com/Azure/azure-container-networking/cns/logger"
 	"github.com/Azure/azure-container-networking/cns/multitenantcontroller"
 	"github.com/Azure/azure-container-networking/cns/multitenantcontroller/multitenantoperator"
 	"github.com/Azure/azure-container-networking/cns/nmagent"
 	"github.com/Azure/azure-container-networking/cns/restserver"
-	kubecontroller "github.com/Azure/azure-container-networking/cns/singletenantcontroller"
 	cnstypes "github.com/Azure/azure-container-networking/cns/types"
 	"github.com/Azure/azure-container-networking/cns/wireserver"
 	acn "github.com/Azure/azure-container-networking/common"
@@ -910,9 +910,9 @@ func reconcileInitialCNSState(ctx context.Context, cli nodeNetworkConfigGetter,
 
 		switch nnc.Status.NetworkContainers[i].AssignmentMode { //nolint:exhaustive // skipping dynamic case
 		case v1alpha.Static:
-			ncRequest, err = kubecontroller.CreateNCRequestFromStaticNC(nnc.Status.NetworkContainers[i])
+			ncRequest, err = nncctrl.CreateNCRequestFromStaticNC(nnc.Status.NetworkContainers[i])
 		default: // For backward compatibility, default will be treated as Dynamic too.
-			ncRequest, err = kubecontroller.CreateNCRequestFromDynamicNC(nnc.Status.NetworkContainers[i])
+			ncRequest, err = nncctrl.CreateNCRequestFromDynamicNC(nnc.Status.NetworkContainers[i])
 		}
 
 		if err != nil {
@@ -999,7 +999,7 @@ func InitializeCRDState(ctx context.Context, httpRestService cns.HTTPService, cn
 		return errors.Wrap(err, "failed to create NNC client")
 	}
 	// TODO(rbtr): nodename and namespace should be in the cns config
-	scopedcli := kubecontroller.NewScopedClient(nnccli, types.NamespacedName{Namespace: "kube-system", Name: nodeName})
+	scopedcli := nncctrl.NewScopedClient(nnccli, types.NamespacedName{Namespace: "kube-system", Name: nodeName})
 
 	// initialize the ipam pool monitor
 	poolOpts := ipampool.Options{
@@ -1076,7 +1076,7 @@ func InitializeCRDState(ctx context.Context, httpRestService cns.HTTPService, cn
 		return errors.Wrapf(err, "failed to get node %s", nodeName)
 	}
 
-	reconciler := kubecontroller.NewReconciler(httpRestServiceImplementation, nnccli, poolMonitor)
+	reconciler := nncctrl.NewReconciler(httpRestServiceImplementation, nnccli, poolMonitor)
 	// pass Node to the Reconciler for Controller xref
 	if err := reconciler.SetupWithManager(manager, node); err != nil {
 		return errors.Wrapf(err, "failed to setup reconciler with manager")