diff --git a/tkg/registry/client_integ_test.go b/tkg/registry/client_integ_test.go
index 9aac7eca2d..7410028b5b 100644
--- a/tkg/registry/client_integ_test.go
+++ b/tkg/registry/client_integ_test.go
@@ -10,8 +10,6 @@ import (
 	"testing"
 
 	ctlimg "github.com/k14s/imgpkg/pkg/imgpkg/registry"
-
-	"github.com/vmware-tanzu/tanzu-framework/tkg/tkrtypes"
 )
 
 func TestRegistryPullBOM(t *testing.T) {
@@ -51,7 +49,7 @@ func TestRegistryPullBOM(t *testing.T) {
 		t.Fatalf("error getting image content should not occurs %s", err.Error())
 	}
 
-	bom, err := tkrtypes.NewBom(content)
+	bom, err := NewBom(content)
 	if err != nil {
 		t.Fatalf("error parsing bom content should not occurs %s", err.Error())
 	}
diff --git a/tkg/tkrtypes/bom.go b/tkg/registry/util_test.go
similarity index 99%
rename from tkg/tkrtypes/bom.go
rename to tkg/registry/util_test.go
index 07fa7fe644..a0ed3b6c9e 100644
--- a/tkg/tkrtypes/bom.go
+++ b/tkg/registry/util_test.go
@@ -1,7 +1,7 @@
 // Copyright 2021 VMware, Inc. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package tkrtypes
+package registry
 
 import (
 	"fmt"
diff --git a/tkg/tkrtypes/bommetadata.go b/tkg/tkrtypes/bommetadata.go
deleted file mode 100644
index 1e2c79636d..0000000000
--- a/tkg/tkrtypes/bommetadata.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2021 VMware, Inc. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-package tkrtypes
-
-// ManagementClusterVersion contains kubernetes versions that are supported by the management cluster with a certain TKG version.
-type ManagementClusterVersion struct {
-	TKGVersion                  string   `json:"version"`
-	SupportedKubernetesVersions []string `json:"supportedKubernetesVersions"`
-}
-
-// CompatibilityMetadata contains tanzu release support matrix
-type CompatibilityMetadata struct {
-	ManagementClusterVersions []ManagementClusterVersion `json:"managementClusterVersions"`
-}
diff --git a/tkg/tkrtypes/doc.go b/tkg/tkrtypes/doc.go
deleted file mode 100644
index 115427d562..0000000000
--- a/tkg/tkrtypes/doc.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2021 VMware, Inc. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package tkrtypes defines some common types used in TKR.
-// Copied over from github.com/vmware-tanzu/tanzu-framework/pkg/v1/tkr/pkg/types
-package tkrtypes