diff --git a/cmd/nodereset.go b/cmd/nodereset.go
index 62a8fca..1070d93 100644
--- a/cmd/nodereset.go
+++ b/cmd/nodereset.go
@@ -55,7 +55,6 @@ func cleanupBinaries() {
 	os.RemoveAll(filepath.Join(constants.BaseInstallDir, "kubeadm"))
 	os.RemoveAll(filepath.Join(constants.BaseInstallDir, "kubectl"))
 
-	os.RemoveAll(constants.KubeVersionInstallDir)
 	os.RemoveAll(constants.ConfInstallDir)
 	os.RemoveAll(constants.CNIBaseDir)
 }
diff --git a/constants/constants.go b/constants/constants.go
index d7f5ecb..c034e58 100644
--- a/constants/constants.go
+++ b/constants/constants.go
@@ -25,21 +25,17 @@ const (
 	KubeadmConfig        = "/tmp/kubeadm.yaml"
 	KubeDNSVersion       = "1.14.8"
 	KeepalivedImage      = "platform9/keepalived:v2.0.4"
-	CacheBaseDir         = "/var/cache/nodeadm/"
+	CacheDir             = "/var/cache/nodeadm/"
 	Execute              = 0744
 	Read                 = 0644
 	ServiceNodePortRange = "80-32767"
 )
 
-var KubeDirName = "kubernetes-" + KubernetesVersion
-var CNIDirName = "cni-" + CNIVersion
-var FlannelDirName = "flannel-" + FlannelVersion
-var NodeadmDirName = "noedadm-" + KubernetesVersion
-
-var KubeVersionInstallDir = filepath.Join(BaseInstallDir, KubeDirName)
-var CniVersionInstallDir = filepath.Join(CNIBaseDir, CNIDirName)
+var KubeDirName = filepath.Join("kubernetes", KubernetesVersion)
+var FlannelDirName = filepath.Join("flannel", FlannelVersion)
+var CNIDirName = filepath.Join("cni", CNIVersion)
+var CniVersionInstallDir = filepath.Join(CNIBaseDir, CNIVersion)
 var ConfInstallDir = filepath.Join(BaseInstallDir, ConfigDir)
-var CacheDir = filepath.Join(CacheBaseDir, KubernetesVersion)
 var ImagesCacheDir = filepath.Join(CacheDir, "images")
 
 const (
diff --git a/utils/install.go b/utils/install.go
index 535496a..558d19a 100644
--- a/utils/install.go
+++ b/utils/install.go
@@ -92,14 +92,9 @@ func placeAndModifyNodeadmKubeletSystemdDropin(netConfig apis.Networking) {
 }
 
 func placeKubeComponents() {
-	err := os.MkdirAll(constants.KubeVersionInstallDir, constants.Execute)
-	if err != nil {
-		log.Fatalf("Failed to create dir %s with error %v\n", constants.KubeVersionInstallDir, err)
-	}
-	deprecated.Run("", "cp", filepath.Join(constants.CacheDir, constants.KubeDirName, "kubectl"), filepath.Join(constants.KubeVersionInstallDir, "kubectl"))
-	deprecated.Run("", "cp", filepath.Join(constants.CacheDir, constants.KubeDirName, "kubeadm"), filepath.Join(constants.KubeVersionInstallDir, "kubeadm"))
-	deprecated.Run("", "cp", filepath.Join(constants.CacheDir, constants.KubeDirName, "kubelet"), filepath.Join(constants.KubeVersionInstallDir, "kubelet"))
-	CreateSymLinks(constants.KubeVersionInstallDir, constants.BaseInstallDir, true)
+	deprecated.Run("", "cp", filepath.Join(constants.CacheDir, constants.KubeDirName, "kubectl"), filepath.Join(constants.BaseInstallDir, "kubectl"))
+	deprecated.Run("", "cp", filepath.Join(constants.CacheDir, constants.KubeDirName, "kubeadm"), filepath.Join(constants.BaseInstallDir, "kubeadm"))
+	deprecated.Run("", "cp", filepath.Join(constants.CacheDir, constants.KubeDirName, "kubelet"), filepath.Join(constants.BaseInstallDir, "kubelet"))
 }
 
 func placeCNIPlugin() {