diff --git a/pkg/utils/fsutils/fsutils.go b/pkg/utils/fsutils/fsutils.go
index d4e45c09167..6cc5a71c0d2 100644
--- a/pkg/utils/fsutils/fsutils.go
+++ b/pkg/utils/fsutils/fsutils.go
@@ -2,7 +2,12 @@ package fsutils
 
 import (
 	"fmt"
+	"log"
 	"os"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+	"strings"
 )
 
 // ToTempFile takes a string to write to a temp file. It returns the filename and an error.
@@ -33,3 +38,26 @@ func IsDirectory(dir string) bool {
 	}
 	return stat.IsDir()
 }
+
+// MustGetThisDir returns the absolute path to the diretory containing the .go file containing the calling function
+func MustGetThisDir() string {
+	_, thisFile, _, ok := runtime.Caller(1)
+	if !ok {
+		log.Fatalf("Failed to get runtime.Caller")
+	}
+	return filepath.Dir(thisFile)
+}
+
+// GoModPath returns the absolute path to the go.mod file for the current dir
+func GoModPath() string {
+	out, err := exec.Command("go", "env", "GOMOD").CombinedOutput()
+	if err != nil {
+		log.Fatal(err)
+	}
+	return strings.TrimSpace(string(out))
+}
+
+// GetModuleRoot returns the project root dir (based on gomod location)
+func GetModuleRoot() string {
+	return filepath.Dir(GoModPath())
+}
diff --git a/projects/gateway2/translator/gateway/gateway_translator_test.go b/projects/gateway2/translator/gateway/gateway_translator_test.go
index 60cc942cb33..c05a7709a4a 100644
--- a/projects/gateway2/translator/gateway/gateway_translator_test.go
+++ b/projects/gateway2/translator/gateway/gateway_translator_test.go
@@ -3,10 +3,9 @@ package gateway_test
 import (
 	"context"
 	"fmt"
-	"log"
 	"path/filepath"
-	"runtime"
 
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -29,7 +28,7 @@ var _ = DescribeTable("Basic GatewayTranslator Tests",
 	func(in translatorTestCase) {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
-		dir := MustGetThisDir()
+		dir := fsutils.MustGetThisDir()
 
 		results, err := TestCase{
 			InputFiles: []string{filepath.Join(dir, "testutils/inputs/", in.inputFile)},
@@ -306,7 +305,7 @@ var _ = DescribeTable("Basic GatewayTranslator Tests",
 var _ = DescribeTable("Route Delegation translator",
 	func(inputFile string, errdesc string) {
 		ctx := context.TODO()
-		dir := MustGetThisDir()
+		dir := fsutils.MustGetThisDir()
 
 		results, err := TestCase{
 			InputFiles: []string{filepath.Join(dir, "testutils/inputs/delegation", inputFile)},
@@ -351,11 +350,3 @@ var _ = DescribeTable("Route Delegation translator",
 	// https://github.com/k8sgateway/k8sgateway/issues/10379
 	Entry("Multi-level multiple parents delegation", "bug-10379.yaml", ""),
 )
-
-func MustGetThisDir() string {
-	_, thisFile, _, ok := runtime.Caller(1)
-	if !ok {
-		log.Fatalf("Failed to get runtime.Caller")
-	}
-	return filepath.Dir(thisFile)
-}
diff --git a/test/kubernetes/e2e/defaults/defaults.go b/test/kubernetes/e2e/defaults/defaults.go
index f9b20514da8..4290da074bf 100644
--- a/test/kubernetes/e2e/defaults/defaults.go
+++ b/test/kubernetes/e2e/defaults/defaults.go
@@ -8,8 +8,8 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	"github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl"
-	"github.com/solo-io/skv2/codegen/util"
 )
 
 var (
@@ -26,7 +26,7 @@ var (
 		},
 	}
 
-	CurlPodManifest = filepath.Join(util.MustGetThisDir(), "testdata", "curl_pod.yaml")
+	CurlPodManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "curl_pod.yaml")
 
 	HttpEchoPod = &corev1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
@@ -35,7 +35,7 @@ var (
 		},
 	}
 
-	HttpEchoPodManifest = filepath.Join(util.MustGetThisDir(), "testdata", "http_echo.yaml")
+	HttpEchoPodManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "http_echo.yaml")
 
 	TcpEchoPod = &corev1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
@@ -44,7 +44,7 @@ var (
 		},
 	}
 
-	TcpEchoPodManifest = filepath.Join(util.MustGetThisDir(), "testdata", "tcp_echo.yaml")
+	TcpEchoPodManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "tcp_echo.yaml")
 
 	NginxPod = &corev1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
@@ -60,7 +60,7 @@ var (
 		},
 	}
 
-	NginxPodManifest = filepath.Join(util.MustGetThisDir(), "testdata", "nginx_pod.yaml")
+	NginxPodManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "nginx_pod.yaml")
 
 	NginxResponse = `<!DOCTYPE html>
 <html>
diff --git a/test/kubernetes/e2e/example/info_logging_test.go b/test/kubernetes/e2e/example/info_logging_test.go
index 3e640ffe5ae..4729f7eee1d 100644
--- a/test/kubernetes/e2e/example/info_logging_test.go
+++ b/test/kubernetes/e2e/example/info_logging_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/kgateway-dev/kgateway/pkg/utils/envutils"
 	"github.com/kgateway-dev/kgateway/test/testutils"
 
-	"github.com/solo-io/skv2/codegen/util"
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	"github.com/stretchr/testify/suite"
 
 	"github.com/kgateway-dev/kgateway/test/kubernetes/e2e"
@@ -30,8 +30,8 @@ func TestInstallationWithInfoLogLevel(t *testing.T) {
 		t,
 		&gloogateway.Context{
 			InstallNamespace:          installNs,
-			ProfileValuesManifestFile: filepath.Join(util.MustGetThisDir(), "manifests", "example-profile.yaml"),
-			ValuesManifestFile:        filepath.Join(util.MustGetThisDir(), "manifests", "info-example.yaml"),
+			ProfileValuesManifestFile: filepath.Join(fsutils.MustGetThisDir(), "manifests", "example-profile.yaml"),
+			ValuesManifestFile:        filepath.Join(fsutils.MustGetThisDir(), "manifests", "info-example.yaml"),
 		},
 	)
 
diff --git a/test/kubernetes/e2e/features/admin_server/types.go b/test/kubernetes/e2e/features/admin_server/types.go
index de0ee1bdf8e..44f1de8099e 100644
--- a/test/kubernetes/e2e/features/admin_server/types.go
+++ b/test/kubernetes/e2e/features/admin_server/types.go
@@ -5,13 +5,13 @@ package admin_server
 import (
 	"path/filepath"
 
-	"github.com/solo-io/skv2/codegen/util"
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 var (
-	upstreamManifest          = filepath.Join(util.MustGetThisDir(), "testdata/upstream.yaml")
-	gatewayParametersManifest = filepath.Join(util.MustGetThisDir(), "testdata/gateway-parameters.yaml")
+	upstreamManifest          = filepath.Join(fsutils.MustGetThisDir(), "testdata/upstream.yaml")
+	gatewayParametersManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata/gateway-parameters.yaml")
 
 	// Upstream resource to be created
 	upstreamMeta = metav1.ObjectMeta{
diff --git a/test/kubernetes/e2e/features/client_tls/types.go b/test/kubernetes/e2e/features/client_tls/types.go
index 46fc5e05cb1..3a9d3b8fa7a 100644
--- a/test/kubernetes/e2e/features/client_tls/types.go
+++ b/test/kubernetes/e2e/features/client_tls/types.go
@@ -6,20 +6,20 @@ import (
 	"net/http"
 	"path/filepath"
 
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	"github.com/kgateway-dev/kgateway/test/gomega/matchers"
 	"github.com/onsi/gomega"
-	"github.com/solo-io/skv2/codegen/util"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 var (
-	annotatedNginxSvcManifestFile       = filepath.Join(util.MustGetThisDir(), "testdata", "annotated-nginx-svc.yaml")
-	annotatedNginxOneWaySvcManifestFile = filepath.Join(util.MustGetThisDir(), "testdata", "annotated-oneway-nginx-svc.yaml")
-	nginxUpstreamManifestFile           = filepath.Join(util.MustGetThisDir(), "testdata", "nginx-upstream.yaml")
-	nginxOneWayUpstreamManifestFile     = filepath.Join(util.MustGetThisDir(), "testdata", "nginx-oneway-upstream.yaml")
-	tlsSecretManifestFile               = filepath.Join(util.MustGetThisDir(), "testdata", "tls-secret.yaml")
+	annotatedNginxSvcManifestFile       = filepath.Join(fsutils.MustGetThisDir(), "testdata", "annotated-nginx-svc.yaml")
+	annotatedNginxOneWaySvcManifestFile = filepath.Join(fsutils.MustGetThisDir(), "testdata", "annotated-oneway-nginx-svc.yaml")
+	nginxUpstreamManifestFile           = filepath.Join(fsutils.MustGetThisDir(), "testdata", "nginx-upstream.yaml")
+	nginxOneWayUpstreamManifestFile     = filepath.Join(fsutils.MustGetThisDir(), "testdata", "nginx-oneway-upstream.yaml")
+	tlsSecretManifestFile               = filepath.Join(fsutils.MustGetThisDir(), "testdata", "tls-secret.yaml")
 
 	// When we apply the deployer-provision.yaml file, we expect resources to be created with this metadata
 	glooProxyObjectMeta = func(ns string) metav1.ObjectMeta {
diff --git a/test/kubernetes/e2e/features/crd_categories/types.go b/test/kubernetes/e2e/features/crd_categories/types.go
index f4395acc455..90031f5681e 100644
--- a/test/kubernetes/e2e/features/crd_categories/types.go
+++ b/test/kubernetes/e2e/features/crd_categories/types.go
@@ -5,11 +5,11 @@ package crd_categories
 import (
 	"path/filepath"
 
-	"github.com/solo-io/skv2/codegen/util"
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 )
 
 var (
-	emptyVsManifest = filepath.Join(util.MustGetThisDir(), "testdata/manifests", "empty-virtualservice.yaml")
+	emptyVsManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata/manifests", "empty-virtualservice.yaml")
 
 	installedVs = "virtualservice.gateway.solo.io/empty-virtualservice"
 )
diff --git a/test/kubernetes/e2e/features/deployer/types.go b/test/kubernetes/e2e/features/deployer/types.go
index 9774416e2ac..ba0d716e79d 100644
--- a/test/kubernetes/e2e/features/deployer/types.go
+++ b/test/kubernetes/e2e/features/deployer/types.go
@@ -5,21 +5,21 @@ package deployer
 import (
 	"path/filepath"
 
-	"github.com/solo-io/skv2/codegen/util"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	"github.com/kgateway-dev/kgateway/projects/gateway2/api/v1alpha1"
 )
 
 var (
-	gatewayWithoutParameters = filepath.Join(util.MustGetThisDir(), "testdata", "gateway-without-parameters.yaml")
-	gatewayWithParameters    = filepath.Join(util.MustGetThisDir(), "testdata", "gateway-with-parameters.yaml")
-	gatewayParametersCustom  = filepath.Join(util.MustGetThisDir(), "testdata", "gatewayparameters-custom.yaml")
-	istioGatewayParameters   = filepath.Join(util.MustGetThisDir(), "testdata", "istio-gateway-parameters.yaml")
-	selfManagedGateway       = filepath.Join(util.MustGetThisDir(), "testdata", "self-managed-gateway.yaml")
+	gatewayWithoutParameters = filepath.Join(fsutils.MustGetThisDir(), "testdata", "gateway-without-parameters.yaml")
+	gatewayWithParameters    = filepath.Join(fsutils.MustGetThisDir(), "testdata", "gateway-with-parameters.yaml")
+	gatewayParametersCustom  = filepath.Join(fsutils.MustGetThisDir(), "testdata", "gatewayparameters-custom.yaml")
+	istioGatewayParameters   = filepath.Join(fsutils.MustGetThisDir(), "testdata", "istio-gateway-parameters.yaml")
+	selfManagedGateway       = filepath.Join(fsutils.MustGetThisDir(), "testdata", "self-managed-gateway.yaml")
 
 	// When we apply the deployer-provision.yaml file, we expect resources to be created with this metadata
 	glooProxyObjectMeta = metav1.ObjectMeta{
diff --git a/test/kubernetes/e2e/features/directresponse/types.go b/test/kubernetes/e2e/features/directresponse/types.go
index 6cbc1cc0589..ad851cb9fdf 100644
--- a/test/kubernetes/e2e/features/directresponse/types.go
+++ b/test/kubernetes/e2e/features/directresponse/types.go
@@ -10,19 +10,19 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	gwv1 "sigs.k8s.io/gateway-api/apis/v1"
 
-	"github.com/solo-io/skv2/codegen/util"
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 )
 
 var (
-	setupManifest                                = filepath.Join(util.MustGetThisDir(), "testdata", "setup.yaml")
-	gatewayManifest                              = filepath.Join(util.MustGetThisDir(), "testdata", "gateway.yaml")
-	basicDirectResposeManifests                  = filepath.Join(util.MustGetThisDir(), "testdata", "basic-direct-response.yaml")
-	basicDelegationManifests                     = filepath.Join(util.MustGetThisDir(), "testdata", "basic-delegation-direct-response.yaml")
-	invalidDelegationConflictingFiltersManifests = filepath.Join(util.MustGetThisDir(), "testdata", "invalid-delegation-conflicting-filters.yaml")
-	invalidMissingRefManifests                   = filepath.Join(util.MustGetThisDir(), "testdata", "invalid-missing-ref-direct-response.yaml")
-	invalidOverlappingFiltersManifests           = filepath.Join(util.MustGetThisDir(), "testdata", "invalid-overlapping-filters.yaml")
-	invalidMultipleRouteActionsManifests         = filepath.Join(util.MustGetThisDir(), "testdata", "invalid-multiple-route-actions.yaml")
-	invalidBackendRefFilterManifests             = filepath.Join(util.MustGetThisDir(), "testdata", "invalid-backendRef-filter.yaml")
+	setupManifest                                = filepath.Join(fsutils.MustGetThisDir(), "testdata", "setup.yaml")
+	gatewayManifest                              = filepath.Join(fsutils.MustGetThisDir(), "testdata", "gateway.yaml")
+	basicDirectResposeManifests                  = filepath.Join(fsutils.MustGetThisDir(), "testdata", "basic-direct-response.yaml")
+	basicDelegationManifests                     = filepath.Join(fsutils.MustGetThisDir(), "testdata", "basic-delegation-direct-response.yaml")
+	invalidDelegationConflictingFiltersManifests = filepath.Join(fsutils.MustGetThisDir(), "testdata", "invalid-delegation-conflicting-filters.yaml")
+	invalidMissingRefManifests                   = filepath.Join(fsutils.MustGetThisDir(), "testdata", "invalid-missing-ref-direct-response.yaml")
+	invalidOverlappingFiltersManifests           = filepath.Join(fsutils.MustGetThisDir(), "testdata", "invalid-overlapping-filters.yaml")
+	invalidMultipleRouteActionsManifests         = filepath.Join(fsutils.MustGetThisDir(), "testdata", "invalid-multiple-route-actions.yaml")
+	invalidBackendRefFilterManifests             = filepath.Join(fsutils.MustGetThisDir(), "testdata", "invalid-backendRef-filter.yaml")
 
 	glooProxyObjectMeta = metav1.ObjectMeta{
 		Name:      "gloo-proxy-gw",
diff --git a/test/kubernetes/e2e/features/discovery_watchlabels/types.go b/test/kubernetes/e2e/features/discovery_watchlabels/types.go
index 4b5aa564b41..c82005a7030 100644
--- a/test/kubernetes/e2e/features/discovery_watchlabels/types.go
+++ b/test/kubernetes/e2e/features/discovery_watchlabels/types.go
@@ -5,12 +5,12 @@ package discovery_watchlabels
 import (
 	"path/filepath"
 
-	"github.com/solo-io/skv2/codegen/util"
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 )
 
 var (
-	serviceWithLabelsManifest           = filepath.Join(util.MustGetThisDir(), "testdata/service-with-labels.yaml")
-	serviceWithModifiedLabelsManifest   = filepath.Join(util.MustGetThisDir(), "testdata/service-with-modified-labels.yaml")
-	serviceWithoutLabelsManifest        = filepath.Join(util.MustGetThisDir(), "testdata/service-without-labels.yaml")
-	serviceWithNoMatchingLabelsManifest = filepath.Join(util.MustGetThisDir(), "testdata/service-with-no-matching-labels.yaml")
+	serviceWithLabelsManifest           = filepath.Join(fsutils.MustGetThisDir(), "testdata/service-with-labels.yaml")
+	serviceWithModifiedLabelsManifest   = filepath.Join(fsutils.MustGetThisDir(), "testdata/service-with-modified-labels.yaml")
+	serviceWithoutLabelsManifest        = filepath.Join(fsutils.MustGetThisDir(), "testdata/service-without-labels.yaml")
+	serviceWithNoMatchingLabelsManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata/service-with-no-matching-labels.yaml")
 )
diff --git a/test/kubernetes/e2e/features/headless_svc/generate/generate.go b/test/kubernetes/e2e/features/headless_svc/generate/generate.go
index 7b92498a34c..0a1b6e0b889 100644
--- a/test/kubernetes/e2e/features/headless_svc/generate/generate.go
+++ b/test/kubernetes/e2e/features/headless_svc/generate/generate.go
@@ -6,10 +6,10 @@ import (
 	"log"
 	"path/filepath"
 
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	"github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults"
 	"github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/headless_svc"
 	"github.com/kgateway-dev/kgateway/test/kubernetes/testutils/resources"
-	"github.com/solo-io/skv2/codegen/util"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -21,7 +21,7 @@ func main() {
 
 	// use the k8s gateway api resources
 	k8sApiResources := []client.Object{headless_svc.K8sGateway, headless_svc.HeadlessSvcHTTPRoute}
-	k8sApiRoutingGeneratedExample := filepath.Join(util.MustGetThisDir(), "generated_example", headless_svc.K8sApiRoutingGeneratedFileName)
+	k8sApiRoutingGeneratedExample := filepath.Join(fsutils.MustGetThisDir(), "generated_example", headless_svc.K8sApiRoutingGeneratedFileName)
 
 	err := resources.WriteResourcesToFile(k8sApiResources, k8sApiRoutingGeneratedExample)
 	if err != nil {
@@ -31,7 +31,7 @@ func main() {
 	// use the Gloo Edge Gateway api resources
 	exampleNs := defaults.GlooSystem
 	edgeGatewayApiResources := headless_svc.GetEdgeGatewayResources(exampleNs)
-	edgeGatewayApiRoutingGeneratedExample := filepath.Join(util.MustGetThisDir(), "generated_example", headless_svc.EdgeGatewayApiRoutingGeneratedFileName)
+	edgeGatewayApiRoutingGeneratedExample := filepath.Join(fsutils.MustGetThisDir(), "generated_example", headless_svc.EdgeGatewayApiRoutingGeneratedFileName)
 	err = resources.WriteResourcesToFile(edgeGatewayApiResources, edgeGatewayApiRoutingGeneratedExample)
 	if err != nil {
 		panic(err)
diff --git a/test/kubernetes/e2e/features/headless_svc/resources.go b/test/kubernetes/e2e/features/headless_svc/resources.go
index 2e4dfb3e8a5..62d9832eefa 100644
--- a/test/kubernetes/e2e/features/headless_svc/resources.go
+++ b/test/kubernetes/e2e/features/headless_svc/resources.go
@@ -11,7 +11,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	gwv1 "sigs.k8s.io/gateway-api/apis/v1"
 
-	"github.com/solo-io/skv2/codegen/util"
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	v1 "github.com/solo-io/solo-apis/pkg/api/gateway.solo.io/v1"
 	soloapis_gloov1 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1"
 	"github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/core/matchers"
@@ -31,7 +31,7 @@ const (
 )
 
 var (
-	headlessSvcSetupManifest = filepath.Join(util.MustGetThisDir(), "testdata", "setup.yaml")
+	headlessSvcSetupManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "setup.yaml")
 
 	// GetEdgeGatewayResources returns the Gloo Gateway Edge API resources
 	GetEdgeGatewayResources = func(installNamespace string) []client.Object {
diff --git a/test/kubernetes/e2e/features/helm/suite.go b/test/kubernetes/e2e/features/helm/suite.go
index 4e567adc694..149ac52dbb6 100644
--- a/test/kubernetes/e2e/features/helm/suite.go
+++ b/test/kubernetes/e2e/features/helm/suite.go
@@ -17,10 +17,10 @@ import (
 	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 
 	"github.com/kgateway-dev/kgateway/pkg/utils/envoyutils/admincli"
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	"github.com/kgateway-dev/kgateway/test/kubernetes/e2e"
 	"github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base"
 	"github.com/kgateway-dev/kgateway/test/kubernetes/testutils/helper"
-	"github.com/solo-io/skv2/codegen/util"
 	"github.com/solo-io/solo-kit/pkg/code-generator/schemagen"
 )
 
@@ -79,7 +79,7 @@ func (s *testingSuite) TestChangedConfigMapTriggersRollout() {
 
 func (s *testingSuite) TestApplyCRDs() {
 	var crdsByFileName = map[string]v1.CustomResourceDefinition{}
-	crdDir := filepath.Join(util.GetModuleRoot(), "install", "helm", s.TestHelper.HelmChartName, "crds")
+	crdDir := filepath.Join(fsutils.GetModuleRoot(), "install", "helm", s.TestHelper.HelmChartName, "crds")
 
 	err := filepath.Walk(crdDir, func(crdFile string, info os.FileInfo, err error) error {
 		if err != nil {
diff --git a/test/kubernetes/e2e/features/helm/types.go b/test/kubernetes/e2e/features/helm/types.go
index a544e2ac354..377ab0b9e7b 100644
--- a/test/kubernetes/e2e/features/helm/types.go
+++ b/test/kubernetes/e2e/features/helm/types.go
@@ -5,13 +5,13 @@ package helm
 import (
 	"path/filepath"
 
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	"github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base"
-	"github.com/solo-io/skv2/codegen/util"
 )
 
 var (
-	productionRecommendationsSetup = filepath.Join(util.MustGetThisDir(), "testdata/manifests", "production-recommendations.yaml")
-	configMapChangeSetup           = filepath.Join(util.MustGetThisDir(), "testdata/manifests", "config-map-change.yaml")
+	productionRecommendationsSetup = filepath.Join(fsutils.MustGetThisDir(), "testdata/manifests", "production-recommendations.yaml")
+	configMapChangeSetup           = filepath.Join(fsutils.MustGetThisDir(), "testdata/manifests", "config-map-change.yaml")
 
 	helmTestCases = map[string]*base.TestCase{
 		"TestProductionRecommendations": {
diff --git a/test/kubernetes/e2e/features/helm_settings/suite.go b/test/kubernetes/e2e/features/helm_settings/suite.go
index cb96f9f76c1..4019bbc4ffb 100644
--- a/test/kubernetes/e2e/features/helm_settings/suite.go
+++ b/test/kubernetes/e2e/features/helm_settings/suite.go
@@ -14,8 +14,8 @@ import (
 
 	"text/template"
 
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	"github.com/kgateway-dev/kgateway/test/kubernetes/e2e"
-	"github.com/solo-io/skv2/codegen/util"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -56,7 +56,7 @@ func NewTestingSuite(ctx context.Context, testInst *e2e.TestInstallation) suite.
 }
 
 func (s *testingSuite) TestApplySettingsManifestsFromUnitTests() {
-	settingsFixturesFolder := filepath.Join(util.GetModuleRoot(), "install", "test", "fixtures", "settings")
+	settingsFixturesFolder := filepath.Join(fsutils.GetModuleRoot(), "install", "test", "fixtures", "settings")
 
 	err := filepath.Walk(settingsFixturesFolder, func(settingsFixtureFile string, info os.FileInfo, err error) error {
 		if err != nil {
diff --git a/test/kubernetes/e2e/features/http_listener_options/lis_opt_types.go b/test/kubernetes/e2e/features/http_listener_options/lis_opt_types.go
index 311b865a0b2..0488c2e72e8 100644
--- a/test/kubernetes/e2e/features/http_listener_options/lis_opt_types.go
+++ b/test/kubernetes/e2e/features/http_listener_options/lis_opt_types.go
@@ -5,17 +5,17 @@ package http_listener_options
 import (
 	"path/filepath"
 
-	"github.com/solo-io/skv2/codegen/util"
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 var (
-	setupManifest             = filepath.Join(util.MustGetThisDir(), "testdata", "setup.yaml")
-	gatewayManifest           = filepath.Join(util.MustGetThisDir(), "testdata", "gateway.yaml")
-	basicLisOptManifest       = filepath.Join(util.MustGetThisDir(), "testdata", "basic-http-lis-opt.yaml")
-	notAttachedLisOptManifest = filepath.Join(util.MustGetThisDir(), "testdata", "not-attached-http-lis-opt.yaml")
+	setupManifest             = filepath.Join(fsutils.MustGetThisDir(), "testdata", "setup.yaml")
+	gatewayManifest           = filepath.Join(fsutils.MustGetThisDir(), "testdata", "gateway.yaml")
+	basicLisOptManifest       = filepath.Join(fsutils.MustGetThisDir(), "testdata", "basic-http-lis-opt.yaml")
+	notAttachedLisOptManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "not-attached-http-lis-opt.yaml")
 
 	// When we apply the setup file, we expect resources to be created with this metadata
 	glooProxyObjectMeta = metav1.ObjectMeta{
diff --git a/test/kubernetes/e2e/features/istio/types.go b/test/kubernetes/e2e/features/istio/types.go
index 6783a77ff99..edc96cd9fad 100644
--- a/test/kubernetes/e2e/features/istio/types.go
+++ b/test/kubernetes/e2e/features/istio/types.go
@@ -6,9 +6,9 @@ import (
 	"net/http"
 	"path/filepath"
 
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers"
 	"github.com/onsi/gomega"
-	"github.com/solo-io/skv2/codegen/util"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -17,14 +17,14 @@ import (
 )
 
 var (
-	setupManifest = filepath.Join(util.MustGetThisDir(), "testdata", "setup.yaml")
+	setupManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "setup.yaml")
 
-	strictPeerAuthManifest     = filepath.Join(util.MustGetThisDir(), "testdata", "strict-peer-auth.yaml")
-	permissivePeerAuthManifest = filepath.Join(util.MustGetThisDir(), "testdata", "permissive-peer-auth.yaml")
-	disablePeerAuthManifest    = filepath.Join(util.MustGetThisDir(), "testdata", "disable-peer-auth.yaml")
+	strictPeerAuthManifest     = filepath.Join(fsutils.MustGetThisDir(), "testdata", "strict-peer-auth.yaml")
+	permissivePeerAuthManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "permissive-peer-auth.yaml")
+	disablePeerAuthManifest    = filepath.Join(fsutils.MustGetThisDir(), "testdata", "disable-peer-auth.yaml")
 
-	k8sRoutingSvcManifest      = filepath.Join(util.MustGetThisDir(), "testdata", "k8s-routing-svc.yaml")
-	k8sRoutingUpstreamManifest = filepath.Join(util.MustGetThisDir(), "testdata", "k8s-routing-upstream.yaml")
+	k8sRoutingSvcManifest      = filepath.Join(fsutils.MustGetThisDir(), "testdata", "k8s-routing-svc.yaml")
+	k8sRoutingUpstreamManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "k8s-routing-upstream.yaml")
 
 	// When we apply the fault injection manifest files, we expect resources to be created with this metadata
 	glooProxyObjectMeta = metav1.ObjectMeta{
diff --git a/test/kubernetes/e2e/features/listener_options/lis_opt_types.go b/test/kubernetes/e2e/features/listener_options/lis_opt_types.go
index 76e8e7f37c7..74714f3fcc2 100644
--- a/test/kubernetes/e2e/features/listener_options/lis_opt_types.go
+++ b/test/kubernetes/e2e/features/listener_options/lis_opt_types.go
@@ -6,10 +6,10 @@ import (
 	"net/http"
 	"path/filepath"
 
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	"github.com/kgateway-dev/kgateway/test/gomega/matchers"
 	e2edefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults"
 	"github.com/onsi/gomega"
-	"github.com/solo-io/skv2/codegen/util"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -17,10 +17,10 @@ import (
 
 var (
 	setupManifests = []string{
-		filepath.Join(util.MustGetThisDir(), "testdata", "setup.yaml"),
+		filepath.Join(fsutils.MustGetThisDir(), "testdata", "setup.yaml"),
 		e2edefaults.CurlPodManifest,
 	}
-	basicLisOptManifest = filepath.Join(util.MustGetThisDir(), "testdata", "basic-lisopt.yaml")
+	basicLisOptManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "basic-lisopt.yaml")
 
 	// When we apply the setup file, we expect resources to be created with this metadata
 	glooProxyObjectMeta = metav1.ObjectMeta{
diff --git a/test/kubernetes/e2e/features/metrics/types.go b/test/kubernetes/e2e/features/metrics/types.go
index cee3387495b..e10ccc14822 100644
--- a/test/kubernetes/e2e/features/metrics/types.go
+++ b/test/kubernetes/e2e/features/metrics/types.go
@@ -5,11 +5,11 @@ package metrics
 import (
 	"path/filepath"
 
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	gloov1 "github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1"
 	"github.com/kgateway-dev/kgateway/projects/gloo/pkg/api/v1/options/kubernetes"
 	testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults"
 	"github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base"
-	"github.com/solo-io/skv2/codegen/util"
 	"github.com/solo-io/solo-kit/pkg/api/v1/resources/core"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -20,9 +20,9 @@ import (
 
 var (
 	// manifests
-	exampleServiceManifest            = filepath.Join(util.MustGetThisDir(), "testdata", "service.yaml")
-	gatewayAndRouteToServiceManifest  = filepath.Join(util.MustGetThisDir(), "testdata", "gateway-and-route-to-service.yaml")
-	gatewayAndRouteToUpstreamManifest = filepath.Join(util.MustGetThisDir(), "testdata", "gateway-and-route-to-upstream.yaml")
+	exampleServiceManifest            = filepath.Join(fsutils.MustGetThisDir(), "testdata", "service.yaml")
+	gatewayAndRouteToServiceManifest  = filepath.Join(fsutils.MustGetThisDir(), "testdata", "gateway-and-route-to-service.yaml")
+	gatewayAndRouteToUpstreamManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "gateway-and-route-to-upstream.yaml")
 
 	// objects
 	glooProxyObjectMeta = metav1.ObjectMeta{
diff --git a/test/kubernetes/e2e/features/port_routing/types.go b/test/kubernetes/e2e/features/port_routing/types.go
index ac9ca812158..7a14e1c4c53 100644
--- a/test/kubernetes/e2e/features/port_routing/types.go
+++ b/test/kubernetes/e2e/features/port_routing/types.go
@@ -12,7 +12,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/solo-io/skv2/codegen/util"
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 
 	testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers"
 )
@@ -23,30 +23,30 @@ type testManifest struct {
 }
 
 var (
-	setupManifest = filepath.Join(util.MustGetThisDir(), "testdata/setup.yaml")
+	setupManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata/setup.yaml")
 
 	// Shared Resources
-	svcInvalidPortAndValidTargetportManifest   = filepath.Join(util.MustGetThisDir(), "testdata", "svc", "invalid-port-and-valid-targetport.yaml")
-	svcInvalidPortAndInvalidTargetportManifest = filepath.Join(util.MustGetThisDir(), "testdata", "svc", "invalid-port-and-invalid-targetport.yaml")
-	svcMatchPodPortWithoutTargetportManifest   = filepath.Join(util.MustGetThisDir(), "testdata", "svc", "match-pod-port-without-targetport.yaml")
-	svcMatchPortandTargetportManifest          = filepath.Join(util.MustGetThisDir(), "testdata", "svc", "match-port-and-targetport.yaml")
-	svcInvalidPortWithoutTargetportManifest    = filepath.Join(util.MustGetThisDir(), "testdata", "svc", "invalid-port-without-targetport.yaml")
+	svcInvalidPortAndValidTargetportManifest   = filepath.Join(fsutils.MustGetThisDir(), "testdata", "svc", "invalid-port-and-valid-targetport.yaml")
+	svcInvalidPortAndInvalidTargetportManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "svc", "invalid-port-and-invalid-targetport.yaml")
+	svcMatchPodPortWithoutTargetportManifest   = filepath.Join(fsutils.MustGetThisDir(), "testdata", "svc", "match-pod-port-without-targetport.yaml")
+	svcMatchPortandTargetportManifest          = filepath.Join(fsutils.MustGetThisDir(), "testdata", "svc", "match-port-and-targetport.yaml")
+	svcInvalidPortWithoutTargetportManifest    = filepath.Join(fsutils.MustGetThisDir(), "testdata", "svc", "invalid-port-without-targetport.yaml")
 
 	// K8s Resources
-	setupK8sManifest                        = filepath.Join(util.MustGetThisDir(), "testdata", "k8s-gw.yaml")
-	invalidPortAndValidTargetportManifest   = filepath.Join(util.MustGetThisDir(), "testdata", "k8s", "invalid-port-and-valid-targetport.yaml")
-	invalidPortAndInvalidTargetportManifest = filepath.Join(util.MustGetThisDir(), "testdata", "k8s", "invalid-port-and-invalid-targetport.yaml")
-	matchPodPortWithoutTargetportManifest   = filepath.Join(util.MustGetThisDir(), "testdata", "k8s", "match-pod-port-without-targetport.yaml")
-	matchPortandTargetportManifest          = filepath.Join(util.MustGetThisDir(), "testdata", "k8s", "match-port-and-targetport.yaml")
-	invalidPortWithoutTargetportManifest    = filepath.Join(util.MustGetThisDir(), "testdata", "k8s", "invalid-port-without-targetport.yaml")
+	setupK8sManifest                        = filepath.Join(fsutils.MustGetThisDir(), "testdata", "k8s-gw.yaml")
+	invalidPortAndValidTargetportManifest   = filepath.Join(fsutils.MustGetThisDir(), "testdata", "k8s", "invalid-port-and-valid-targetport.yaml")
+	invalidPortAndInvalidTargetportManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "k8s", "invalid-port-and-invalid-targetport.yaml")
+	matchPodPortWithoutTargetportManifest   = filepath.Join(fsutils.MustGetThisDir(), "testdata", "k8s", "match-pod-port-without-targetport.yaml")
+	matchPortandTargetportManifest          = filepath.Join(fsutils.MustGetThisDir(), "testdata", "k8s", "match-port-and-targetport.yaml")
+	invalidPortWithoutTargetportManifest    = filepath.Join(fsutils.MustGetThisDir(), "testdata", "k8s", "invalid-port-without-targetport.yaml")
 
 	// Gloo Edge Resources
-	setupEdgeManifest                               = filepath.Join(util.MustGetThisDir(), "testdata", "edge-routing.yaml")
-	upstreamInvalidPortAndValidTargetportManifest   = filepath.Join(util.MustGetThisDir(), "testdata", "edge", "invalid-port-and-valid-targetport.yaml")
-	upstreamInvalidPortAndInvalidTargetportManifest = filepath.Join(util.MustGetThisDir(), "testdata", "edge", "invalid-port-and-invalid-targetport.yaml")
-	upstreamMatchPodPortWithoutTargetportManifest   = filepath.Join(util.MustGetThisDir(), "testdata", "edge", "match-pod-port-without-targetport.yaml")
-	upstreamMatchPortandTargetportManifest          = filepath.Join(util.MustGetThisDir(), "testdata", "edge", "match-port-and-targetport.yaml")
-	upstreamInvalidPortWithoutTargetportManifest    = filepath.Join(util.MustGetThisDir(), "testdata", "edge", "invalid-port-without-targetport.yaml")
+	setupEdgeManifest                               = filepath.Join(fsutils.MustGetThisDir(), "testdata", "edge-routing.yaml")
+	upstreamInvalidPortAndValidTargetportManifest   = filepath.Join(fsutils.MustGetThisDir(), "testdata", "edge", "invalid-port-and-valid-targetport.yaml")
+	upstreamInvalidPortAndInvalidTargetportManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "edge", "invalid-port-and-invalid-targetport.yaml")
+	upstreamMatchPodPortWithoutTargetportManifest   = filepath.Join(fsutils.MustGetThisDir(), "testdata", "edge", "match-pod-port-without-targetport.yaml")
+	upstreamMatchPortandTargetportManifest          = filepath.Join(fsutils.MustGetThisDir(), "testdata", "edge", "match-port-and-targetport.yaml")
+	upstreamInvalidPortWithoutTargetportManifest    = filepath.Join(fsutils.MustGetThisDir(), "testdata", "edge", "invalid-port-without-targetport.yaml")
 
 	// When we apply the setup.yaml file, we expect resources to be created with this metadata
 	glooProxyObjectMeta = metav1.ObjectMeta{
diff --git a/test/kubernetes/e2e/features/route_delegation/types.go b/test/kubernetes/e2e/features/route_delegation/types.go
index 2cb79e48963..4744c27c112 100644
--- a/test/kubernetes/e2e/features/route_delegation/types.go
+++ b/test/kubernetes/e2e/features/route_delegation/types.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/solo-io/skv2/codegen/util"
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -20,7 +20,7 @@ const (
 
 // ref: test/kubernetes/e2e/features/delegation/testdata/common.yaml
 var (
-	commonManifest = filepath.Join(util.MustGetThisDir(), "testdata", "common.yaml")
+	commonManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "common.yaml")
 	proxyMeta      = metav1.ObjectMeta{
 		Name:      "gloo-proxy-http-gateway",
 		Namespace: "infra",
@@ -105,14 +105,14 @@ var (
 )
 
 var (
-	basicRoutesManifest                 = filepath.Join(util.MustGetThisDir(), "testdata", "basic.yaml")
-	recursiveRoutesManifest             = filepath.Join(util.MustGetThisDir(), "testdata", "recursive.yaml")
-	cyclicRoutesManifest                = filepath.Join(util.MustGetThisDir(), "testdata", "cyclic.yaml")
-	invalidChildRoutesManifest          = filepath.Join(util.MustGetThisDir(), "testdata", "invalid_child.yaml")
-	headerQueryMatchRoutesManifest      = filepath.Join(util.MustGetThisDir(), "testdata", "header_query_match.yaml")
-	multipleParentsManifest             = filepath.Join(util.MustGetThisDir(), "testdata", "multiple_parents.yaml")
-	invalidChildValidStandaloneManifest = filepath.Join(util.MustGetThisDir(), "testdata", "invalid_child_valid_standalone.yaml")
-	unresolvedChildManifest             = filepath.Join(util.MustGetThisDir(), "testdata", "unresolved_child.yaml")
-	routeOptionsManifest                = filepath.Join(util.MustGetThisDir(), "testdata", "route_options.yaml")
-	matcherInheritanceManifest          = filepath.Join(util.MustGetThisDir(), "testdata", "matcher_inheritance.yaml")
+	basicRoutesManifest                 = filepath.Join(fsutils.MustGetThisDir(), "testdata", "basic.yaml")
+	recursiveRoutesManifest             = filepath.Join(fsutils.MustGetThisDir(), "testdata", "recursive.yaml")
+	cyclicRoutesManifest                = filepath.Join(fsutils.MustGetThisDir(), "testdata", "cyclic.yaml")
+	invalidChildRoutesManifest          = filepath.Join(fsutils.MustGetThisDir(), "testdata", "invalid_child.yaml")
+	headerQueryMatchRoutesManifest      = filepath.Join(fsutils.MustGetThisDir(), "testdata", "header_query_match.yaml")
+	multipleParentsManifest             = filepath.Join(fsutils.MustGetThisDir(), "testdata", "multiple_parents.yaml")
+	invalidChildValidStandaloneManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "invalid_child_valid_standalone.yaml")
+	unresolvedChildManifest             = filepath.Join(fsutils.MustGetThisDir(), "testdata", "unresolved_child.yaml")
+	routeOptionsManifest                = filepath.Join(fsutils.MustGetThisDir(), "testdata", "route_options.yaml")
+	matcherInheritanceManifest          = filepath.Join(fsutils.MustGetThisDir(), "testdata", "matcher_inheritance.yaml")
 )
diff --git a/test/kubernetes/e2e/features/route_options/types.go b/test/kubernetes/e2e/features/route_options/types.go
index 2b8d5f6a70a..c4f74cb2158 100644
--- a/test/kubernetes/e2e/features/route_options/types.go
+++ b/test/kubernetes/e2e/features/route_options/types.go
@@ -6,29 +6,29 @@ import (
 	"net/http"
 	"path/filepath"
 
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	"github.com/kgateway-dev/kgateway/test/gomega/matchers"
 	"github.com/onsi/gomega"
 	"github.com/onsi/gomega/gstruct"
-	"github.com/solo-io/skv2/codegen/util"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 var (
-	setupManifest                        = filepath.Join(util.MustGetThisDir(), "testdata", "setup.yaml")
-	basicRtoManifest                     = filepath.Join(util.MustGetThisDir(), "testdata", "basic-rto.yaml")
-	basicRtoTargetRefManifest            = filepath.Join(util.MustGetThisDir(), "testdata", "basic-rto-targetref.yaml")
-	extraRtoManifest                     = filepath.Join(util.MustGetThisDir(), "testdata", "extra-rto.yaml")
-	extraRtoTargetRefManifest            = filepath.Join(util.MustGetThisDir(), "testdata", "extra-rto-targetref.yaml")
-	badRtoManifest                       = filepath.Join(util.MustGetThisDir(), "testdata", "bad-rto.yaml")
-	badRtoTargetRefManifest              = filepath.Join(util.MustGetThisDir(), "testdata", "bad-rto-targetref.yaml")
-	httproute1Manifest                   = filepath.Join(util.MustGetThisDir(), "testdata", "httproute1.yaml")
-	httproute1ExtensionManifest          = filepath.Join(util.MustGetThisDir(), "testdata", "httproute1-extension.yaml")
-	httproute1BadExtensionManifest       = filepath.Join(util.MustGetThisDir(), "testdata", "httproute1-bad-extension.yaml")
-	httproute1MultipleExtensionsManifest = filepath.Join(util.MustGetThisDir(), "testdata", "httproute1-multiple-extensions.yaml")
-	httproute2Manifest                   = filepath.Join(util.MustGetThisDir(), "testdata", "httproute2.yaml")
-	mergeManifest                        = filepath.Join(util.MustGetThisDir(), "testdata", "merge.yaml")
+	setupManifest                        = filepath.Join(fsutils.MustGetThisDir(), "testdata", "setup.yaml")
+	basicRtoManifest                     = filepath.Join(fsutils.MustGetThisDir(), "testdata", "basic-rto.yaml")
+	basicRtoTargetRefManifest            = filepath.Join(fsutils.MustGetThisDir(), "testdata", "basic-rto-targetref.yaml")
+	extraRtoManifest                     = filepath.Join(fsutils.MustGetThisDir(), "testdata", "extra-rto.yaml")
+	extraRtoTargetRefManifest            = filepath.Join(fsutils.MustGetThisDir(), "testdata", "extra-rto-targetref.yaml")
+	badRtoManifest                       = filepath.Join(fsutils.MustGetThisDir(), "testdata", "bad-rto.yaml")
+	badRtoTargetRefManifest              = filepath.Join(fsutils.MustGetThisDir(), "testdata", "bad-rto-targetref.yaml")
+	httproute1Manifest                   = filepath.Join(fsutils.MustGetThisDir(), "testdata", "httproute1.yaml")
+	httproute1ExtensionManifest          = filepath.Join(fsutils.MustGetThisDir(), "testdata", "httproute1-extension.yaml")
+	httproute1BadExtensionManifest       = filepath.Join(fsutils.MustGetThisDir(), "testdata", "httproute1-bad-extension.yaml")
+	httproute1MultipleExtensionsManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "httproute1-multiple-extensions.yaml")
+	httproute2Manifest                   = filepath.Join(fsutils.MustGetThisDir(), "testdata", "httproute2.yaml")
+	mergeManifest                        = filepath.Join(fsutils.MustGetThisDir(), "testdata", "merge.yaml")
 
 	// When we apply the fault injection manifest files, we expect resources to be created with this metadata
 	proxyService = &corev1.Service{
diff --git a/test/kubernetes/e2e/features/server_tls/types.go b/test/kubernetes/e2e/features/server_tls/types.go
index ba4df4ebbc3..64c98c29993 100644
--- a/test/kubernetes/e2e/features/server_tls/types.go
+++ b/test/kubernetes/e2e/features/server_tls/types.go
@@ -7,9 +7,9 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	"github.com/kgateway-dev/kgateway/test/gomega/matchers"
 	"github.com/onsi/gomega"
-	"github.com/solo-io/skv2/codegen/util"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -88,7 +88,7 @@ const (
 )
 
 func manifestFromFile(fname string) ([]byte, error) {
-	return withSubstitutions(filepath.Join(util.MustGetThisDir(), "testdata", fname))
+	return withSubstitutions(filepath.Join(fsutils.MustGetThisDir(), "testdata", fname))
 }
 func withSubstitutions(fname string) ([]byte, error) {
 	// VS with secret should be accepted, need to substitute the secret ns
diff --git a/test/kubernetes/e2e/features/services/httproute/types.go b/test/kubernetes/e2e/features/services/httproute/types.go
index 3b6e0320694..837fbd18070 100644
--- a/test/kubernetes/e2e/features/services/httproute/types.go
+++ b/test/kubernetes/e2e/features/services/httproute/types.go
@@ -8,7 +8,7 @@ import (
 
 	testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers"
 
-	"github.com/solo-io/skv2/codegen/util"
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 
 	"github.com/kgateway-dev/kgateway/projects/gateway2/crds"
 	"github.com/onsi/gomega/gstruct"
@@ -18,8 +18,8 @@ import (
 )
 
 var (
-	routeWithServiceManifest = filepath.Join(util.MustGetThisDir(), "testdata", "route-with-service.yaml")
-	serviceManifest          = filepath.Join(util.MustGetThisDir(), "testdata", "service-for-route.yaml")
+	routeWithServiceManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "route-with-service.yaml")
+	serviceManifest          = filepath.Join(fsutils.MustGetThisDir(), "testdata", "service-for-route.yaml")
 	tcpRouteCrdManifest      = filepath.Join(crds.AbsPathToCrd("tcproute-crd.yaml"))
 
 	// Proxy resource to be translated
diff --git a/test/kubernetes/e2e/features/services/tcproute/types.go b/test/kubernetes/e2e/features/services/tcproute/types.go
index b88b0fdf464..a3f86a21c44 100644
--- a/test/kubernetes/e2e/features/services/tcproute/types.go
+++ b/test/kubernetes/e2e/features/services/tcproute/types.go
@@ -10,7 +10,7 @@ import (
 
 	testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers"
 
-	"github.com/solo-io/skv2/codegen/util"
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 
 	"github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
@@ -58,31 +58,31 @@ const (
 
 var (
 	// Variables used by TestConfigureTCPRouteBackingDestinationsWithSingleService
-	multiSvcNsManifest               = filepath.Join(util.MustGetThisDir(), "testdata", "multi-ns.yaml")
-	multiSvcGatewayAndClientManifest = filepath.Join(util.MustGetThisDir(), "testdata", "multi-listener-gateway-and-client.yaml")
-	multiSvcBackendManifest          = filepath.Join(util.MustGetThisDir(), "testdata", "multi-backend-service.yaml")
-	multiSvcTcpRouteManifest         = filepath.Join(util.MustGetThisDir(), "testdata", "multi-tcproute.yaml")
+	multiSvcNsManifest               = filepath.Join(fsutils.MustGetThisDir(), "testdata", "multi-ns.yaml")
+	multiSvcGatewayAndClientManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "multi-listener-gateway-and-client.yaml")
+	multiSvcBackendManifest          = filepath.Join(fsutils.MustGetThisDir(), "testdata", "multi-backend-service.yaml")
+	multiSvcTcpRouteManifest         = filepath.Join(fsutils.MustGetThisDir(), "testdata", "multi-tcproute.yaml")
 
 	// Variables used by TestConfigureTCPRouteBackingDestinationsWithMultiServices
-	singleSvcNsManifest               = filepath.Join(util.MustGetThisDir(), "testdata", "single-ns.yaml")
-	singleSvcGatewayAndClientManifest = filepath.Join(util.MustGetThisDir(), "testdata", "single-listener-gateway-and-client.yaml")
-	singleSvcBackendManifest          = filepath.Join(util.MustGetThisDir(), "testdata", "single-backend-service.yaml")
-	singleSvcTcpRouteManifest         = filepath.Join(util.MustGetThisDir(), "testdata", "single-tcproute.yaml")
+	singleSvcNsManifest               = filepath.Join(fsutils.MustGetThisDir(), "testdata", "single-ns.yaml")
+	singleSvcGatewayAndClientManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "single-listener-gateway-and-client.yaml")
+	singleSvcBackendManifest          = filepath.Join(fsutils.MustGetThisDir(), "testdata", "single-backend-service.yaml")
+	singleSvcTcpRouteManifest         = filepath.Join(fsutils.MustGetThisDir(), "testdata", "single-tcproute.yaml")
 
 	// Manifests for CrossNamespaceTCPRouteWithReferenceGrant
-	crossNsClientNsManifest   = filepath.Join(util.MustGetThisDir(), "testdata", "cross-ns-client-ns.yaml")
-	crossNsBackendNsManifest  = filepath.Join(util.MustGetThisDir(), "testdata", "cross-ns-backend-ns.yaml")
-	crossNsGatewayManifest    = filepath.Join(util.MustGetThisDir(), "testdata", "cross-ns-gateway-and-client.yaml")
-	crossNsBackendSvcManifest = filepath.Join(util.MustGetThisDir(), "testdata", "cross-ns-backend-service.yaml")
-	crossNsTCPRouteManifest   = filepath.Join(util.MustGetThisDir(), "testdata", "cross-ns-tcproute.yaml")
-	crossNsRefGrantManifest   = filepath.Join(util.MustGetThisDir(), "testdata", "cross-ns-referencegrant.yaml")
+	crossNsClientNsManifest   = filepath.Join(fsutils.MustGetThisDir(), "testdata", "cross-ns-client-ns.yaml")
+	crossNsBackendNsManifest  = filepath.Join(fsutils.MustGetThisDir(), "testdata", "cross-ns-backend-ns.yaml")
+	crossNsGatewayManifest    = filepath.Join(fsutils.MustGetThisDir(), "testdata", "cross-ns-gateway-and-client.yaml")
+	crossNsBackendSvcManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "cross-ns-backend-service.yaml")
+	crossNsTCPRouteManifest   = filepath.Join(fsutils.MustGetThisDir(), "testdata", "cross-ns-tcproute.yaml")
+	crossNsRefGrantManifest   = filepath.Join(fsutils.MustGetThisDir(), "testdata", "cross-ns-referencegrant.yaml")
 
 	// Manifests for CrossNamespaceTCPRouteWithoutReferenceGrant
-	crossNsNoRefGrantClientNsManifest   = filepath.Join(util.MustGetThisDir(), "testdata", "cross-ns-no-refgrant-client-ns.yaml")
-	crossNsNoRefGrantBackendNsManifest  = filepath.Join(util.MustGetThisDir(), "testdata", "cross-ns-no-refgrant-backend-ns.yaml")
-	crossNsNoRefGrantGatewayManifest    = filepath.Join(util.MustGetThisDir(), "testdata", "cross-ns-no-refgrant-gateway-and-client.yaml")
-	crossNsNoRefGrantBackendSvcManifest = filepath.Join(util.MustGetThisDir(), "testdata", "cross-ns-no-refgrant-backend-service.yaml")
-	crossNsNoRefGrantTCPRouteManifest   = filepath.Join(util.MustGetThisDir(), "testdata", "cross-ns-no-refgrant-tcproute.yaml")
+	crossNsNoRefGrantClientNsManifest   = filepath.Join(fsutils.MustGetThisDir(), "testdata", "cross-ns-no-refgrant-client-ns.yaml")
+	crossNsNoRefGrantBackendNsManifest  = filepath.Join(fsutils.MustGetThisDir(), "testdata", "cross-ns-no-refgrant-backend-ns.yaml")
+	crossNsNoRefGrantGatewayManifest    = filepath.Join(fsutils.MustGetThisDir(), "testdata", "cross-ns-no-refgrant-gateway-and-client.yaml")
+	crossNsNoRefGrantBackendSvcManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "cross-ns-no-refgrant-backend-service.yaml")
+	crossNsNoRefGrantTCPRouteManifest   = filepath.Join(fsutils.MustGetThisDir(), "testdata", "cross-ns-no-refgrant-tcproute.yaml")
 
 	// Assertion test timers
 	ctxTimeout = 5 * time.Minute
diff --git a/test/kubernetes/e2e/features/tracing/types.go b/test/kubernetes/e2e/features/tracing/types.go
index 76b140acf3a..da6a93bf837 100644
--- a/test/kubernetes/e2e/features/tracing/types.go
+++ b/test/kubernetes/e2e/features/tracing/types.go
@@ -5,7 +5,7 @@ package tracing
 import (
 	"path/filepath"
 
-	"github.com/solo-io/skv2/codegen/util"
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -19,10 +19,10 @@ const (
 )
 
 var (
-	setupOtelcolManifest        = filepath.Join(util.MustGetThisDir(), "testdata", "setup-otelcol.yaml")
-	tracingConfigManifest       = filepath.Join(util.MustGetThisDir(), "testdata", "tracing.yaml")
-	gatewayConfigManifest       = filepath.Join(util.MustGetThisDir(), "testdata", "gateway.yaml")
-	gatewayProxyServiceManifest = filepath.Join(util.MustGetThisDir(), "testdata", "gw-proxy-tracing-service.yaml")
+	setupOtelcolManifest        = filepath.Join(fsutils.MustGetThisDir(), "testdata", "setup-otelcol.yaml")
+	tracingConfigManifest       = filepath.Join(fsutils.MustGetThisDir(), "testdata", "tracing.yaml")
+	gatewayConfigManifest       = filepath.Join(fsutils.MustGetThisDir(), "testdata", "gateway.yaml")
+	gatewayProxyServiceManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "gw-proxy-tracing-service.yaml")
 
 	otelcolPod = &corev1.Pod{
 		ObjectMeta: metav1.ObjectMeta{Name: "otel-collector", Namespace: "default"},
diff --git a/test/kubernetes/e2e/features/upgrade/suite.go b/test/kubernetes/e2e/features/upgrade/suite.go
index cc4e734d0ae..91a8683ea80 100644
--- a/test/kubernetes/e2e/features/upgrade/suite.go
+++ b/test/kubernetes/e2e/features/upgrade/suite.go
@@ -9,10 +9,10 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	"github.com/kgateway-dev/kgateway/test/kubernetes/e2e"
 	"github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base"
 	"github.com/kgateway-dev/kgateway/test/kubernetes/testutils/helper"
-	"github.com/solo-io/skv2/codegen/util"
 )
 
 var _ e2e.NewSuiteFunc = NewTestingSuite
@@ -63,7 +63,7 @@ func (s *testingSuite) TestUpdateValidationServerGrpcMaxSizeBytes() {
 	settings := s.GetKubectlOutput("-n", s.TestInstallation.Metadata.InstallNamespace, "get", "settings", "default", "-o", "yaml")
 	s.TestInstallation.Assertions.Assert.Contains(settings, "invalidRouteResponseCode: 404")
 
-	s.UpgradeWithCustomValuesFile(filepath.Join(util.MustGetThisDir(), "testdata/manifests", "server-grpc-max-size-bytes.yaml"))
+	s.UpgradeWithCustomValuesFile(filepath.Join(fsutils.MustGetThisDir(), "testdata/manifests", "server-grpc-max-size-bytes.yaml"))
 
 	// Verify that the changes in helm reflected in the settings CR
 	settings = s.GetKubectlOutput("-n", s.TestInstallation.Metadata.InstallNamespace, "get", "settings", "default", "-o", "yaml")
@@ -76,7 +76,7 @@ func (s *testingSuite) TestAddSecondGatewayProxySeparateNamespace() {
 	externalNamespace := "other-ns"
 	s.GetKubectlOutput("create", "ns", externalNamespace)
 
-	s.UpgradeWithCustomValuesFile(filepath.Join(util.MustGetThisDir(), "testdata/manifests", "secondary-gateway-namespace-validation.yaml"))
+	s.UpgradeWithCustomValuesFile(filepath.Join(fsutils.MustGetThisDir(), "testdata/manifests", "secondary-gateway-namespace-validation.yaml"))
 
 	// Ensures deployment is created for both default namespace and external one
 	// Note - name of external deployments is kebab-case of gatewayProxies NAME helm value
@@ -103,7 +103,7 @@ func (s *testingSuite) TestValidationWebhookCABundle() {
 
 	ensureWebhookCABundleMatchesSecretsRootCAValue()
 
-	s.UpgradeWithCustomValuesFile(filepath.Join(util.MustGetThisDir(), "testdata/manifests", "strict-validation.yaml"))
+	s.UpgradeWithCustomValuesFile(filepath.Join(fsutils.MustGetThisDir(), "testdata/manifests", "strict-validation.yaml"))
 
 	// Ensure the webhook caBundle should be the same as the secret's root ca value post upgrade
 	ensureWebhookCABundleMatchesSecretsRootCAValue()
diff --git a/test/kubernetes/e2e/features/upstreams/types.go b/test/kubernetes/e2e/features/upstreams/types.go
index 43c6474d796..63613c7c8d1 100644
--- a/test/kubernetes/e2e/features/upstreams/types.go
+++ b/test/kubernetes/e2e/features/upstreams/types.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"path/filepath"
 
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	"github.com/onsi/gomega"
-	"github.com/solo-io/skv2/codegen/util"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -18,8 +18,8 @@ import (
 )
 
 var (
-	routeWithUpstreamManifest = filepath.Join(util.MustGetThisDir(), "inputs/route-with-upstream.yaml")
-	upstreamManifest          = filepath.Join(util.MustGetThisDir(), "inputs/upstream-for-route.yaml")
+	routeWithUpstreamManifest = filepath.Join(fsutils.MustGetThisDir(), "inputs/route-with-upstream.yaml")
+	upstreamManifest          = filepath.Join(fsutils.MustGetThisDir(), "inputs/upstream-for-route.yaml")
 
 	// Proxy resource to be translated
 	glooProxyObjectMeta = metav1.ObjectMeta{
diff --git a/test/kubernetes/e2e/features/virtualhost_options/types.go b/test/kubernetes/e2e/features/virtualhost_options/types.go
index cd335cf02c2..99bfa5d9060 100644
--- a/test/kubernetes/e2e/features/virtualhost_options/types.go
+++ b/test/kubernetes/e2e/features/virtualhost_options/types.go
@@ -6,11 +6,11 @@ import (
 	"net/http"
 	"path/filepath"
 
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	"github.com/kgateway-dev/kgateway/test/gomega/matchers"
 	e2edefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults"
 	"github.com/onsi/gomega"
 	"github.com/onsi/gomega/gstruct"
-	"github.com/solo-io/skv2/codegen/util"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -18,15 +18,15 @@ import (
 
 var (
 	setupManifests = []string{
-		filepath.Join(util.MustGetThisDir(), "testdata", "setup.yaml"),
+		filepath.Join(fsutils.MustGetThisDir(), "testdata", "setup.yaml"),
 		e2edefaults.CurlPodManifest,
 	}
 
-	manifestVhoRemoveXBar      = filepath.Join(util.MustGetThisDir(), "testdata", "vho-remove-x-bar.yaml")
-	manifestVhoSectionAddXFoo  = filepath.Join(util.MustGetThisDir(), "testdata", "vho-section-add-x-foo.yaml")
-	manifestVhoRemoveXBaz      = filepath.Join(util.MustGetThisDir(), "testdata", "vho-remove-x-baz.yaml")
-	manifestVhoWebhookReject   = filepath.Join(util.MustGetThisDir(), "testdata", "vho-webhook-reject.yaml")
-	manifestVhoMergeRemoveXBaz = filepath.Join(util.MustGetThisDir(), "testdata", "vho-merge-remove-x-baz.yaml")
+	manifestVhoRemoveXBar      = filepath.Join(fsutils.MustGetThisDir(), "testdata", "vho-remove-x-bar.yaml")
+	manifestVhoSectionAddXFoo  = filepath.Join(fsutils.MustGetThisDir(), "testdata", "vho-section-add-x-foo.yaml")
+	manifestVhoRemoveXBaz      = filepath.Join(fsutils.MustGetThisDir(), "testdata", "vho-remove-x-baz.yaml")
+	manifestVhoWebhookReject   = filepath.Join(fsutils.MustGetThisDir(), "testdata", "vho-webhook-reject.yaml")
+	manifestVhoMergeRemoveXBaz = filepath.Join(fsutils.MustGetThisDir(), "testdata", "vho-merge-remove-x-baz.yaml")
 
 	// When we apply the setup file, we expect resources to be created with this metadata
 	glooProxyObjectMeta = metav1.ObjectMeta{
diff --git a/test/kubernetes/e2e/features/watch_namespace_selector/types.go b/test/kubernetes/e2e/features/watch_namespace_selector/types.go
index fc7ac74eaea..b497b95df7d 100644
--- a/test/kubernetes/e2e/features/watch_namespace_selector/types.go
+++ b/test/kubernetes/e2e/features/watch_namespace_selector/types.go
@@ -5,8 +5,8 @@ package watch_namespace_selector
 import (
 	"path/filepath"
 
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	"github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base"
-	"github.com/solo-io/skv2/codegen/util"
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
@@ -16,19 +16,19 @@ import (
 )
 
 var (
-	installNamespaceVSManifest = filepath.Join(util.MustGetThisDir(), "testdata", "vs-install-ns.yaml")
+	installNamespaceVSManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "vs-install-ns.yaml")
 
-	unlabeledRandomNamespaceManifest = filepath.Join(util.MustGetThisDir(), "testdata", "random-ns-unlabeled.yaml")
+	unlabeledRandomNamespaceManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "random-ns-unlabeled.yaml")
 	randomNamespace                  = &corev1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "random",
 		},
 	}
 
-	randomVSManifest = filepath.Join(util.MustGetThisDir(), "testdata", "vs-random.yaml")
+	randomVSManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "vs-random.yaml")
 
-	randomUpstreamManifest                       = filepath.Join(util.MustGetThisDir(), "testdata", "upstream-random.yaml")
-	installNamespaceWithRandomUpstreamVSManifest = filepath.Join(util.MustGetThisDir(), "testdata", "vs-upstream.yaml")
+	randomUpstreamManifest                       = filepath.Join(fsutils.MustGetThisDir(), "testdata", "upstream-random.yaml")
+	installNamespaceWithRandomUpstreamVSManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "vs-upstream.yaml")
 
 	randomNamespaceVS = &gatewayv1.VirtualService{
 		ObjectMeta: metav1.ObjectMeta{
diff --git a/test/kubernetes/e2e/features/zero_downtime_rollout/types.go b/test/kubernetes/e2e/features/zero_downtime_rollout/types.go
index 88873f593f0..dd736c3ae4a 100644
--- a/test/kubernetes/e2e/features/zero_downtime_rollout/types.go
+++ b/test/kubernetes/e2e/features/zero_downtime_rollout/types.go
@@ -9,7 +9,7 @@ import (
 	"github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/solo-io/skv2/codegen/util"
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -17,8 +17,8 @@ import (
 )
 
 var (
-	routeWithServiceManifest = filepath.Join(util.MustGetThisDir(), "testdata", "route-with-service.yaml")
-	serviceManifest          = filepath.Join(util.MustGetThisDir(), "testdata", "service-for-route.yaml")
+	routeWithServiceManifest = filepath.Join(fsutils.MustGetThisDir(), "testdata", "route-with-service.yaml")
+	serviceManifest          = filepath.Join(fsutils.MustGetThisDir(), "testdata", "service-for-route.yaml")
 
 	glooProxyObjectMeta = metav1.ObjectMeta{
 		Name:      "gloo-proxy-gw",
diff --git a/test/kubernetes/e2e/file.go b/test/kubernetes/e2e/file.go
index 4a24a9f09c0..99f77f8b69c 100644
--- a/test/kubernetes/e2e/file.go
+++ b/test/kubernetes/e2e/file.go
@@ -5,7 +5,7 @@ package e2e
 import (
 	"path/filepath"
 
-	"github.com/solo-io/skv2/codegen/util"
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 )
 
 var (
@@ -27,7 +27,7 @@ var (
 // These are all stored in the tests/manifests directory
 func ManifestPath(pathParts ...string) string {
 	manifestPathParts := append([]string{
-		util.MustGetThisDir(),
+		fsutils.MustGetThisDir(),
 		"tests",
 		"manifests",
 	}, pathParts...)
diff --git a/test/kubernetes/e2e/tests/discovery_watchlabels_test.go b/test/kubernetes/e2e/tests/discovery_watchlabels_test.go
index 330d471f658..5dfd25379a6 100644
--- a/test/kubernetes/e2e/tests/discovery_watchlabels_test.go
+++ b/test/kubernetes/e2e/tests/discovery_watchlabels_test.go
@@ -10,11 +10,11 @@ import (
 	"time"
 
 	"github.com/kgateway-dev/kgateway/pkg/utils/envutils"
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	"github.com/kgateway-dev/kgateway/test/kubernetes/e2e"
 	. "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests"
 	"github.com/kgateway-dev/kgateway/test/kubernetes/testutils/gloogateway"
 	"github.com/kgateway-dev/kgateway/test/testutils"
-	"github.com/solo-io/skv2/codegen/util"
 )
 
 // TestDiscoveryWatchlabels is the function which executes a series of tests against a given installation where
@@ -27,7 +27,7 @@ func TestDiscoveryWatchlabels(t *testing.T) {
 		&gloogateway.Context{
 			InstallNamespace:          installNs,
 			ProfileValuesManifestFile: e2e.KubernetesGatewayProfilePath,
-			ValuesManifestFile:        filepath.Join(util.MustGetThisDir(), "manifests", "discovery-watchlabels-test-helm.yaml"),
+			ValuesManifestFile:        filepath.Join(fsutils.MustGetThisDir(), "manifests", "discovery-watchlabels-test-helm.yaml"),
 		},
 	)
 
diff --git a/test/kubernetes/testutils/helper/util.go b/test/kubernetes/testutils/helper/util.go
index d3d2f89d4d5..8992e1a9ee4 100644
--- a/test/kubernetes/testutils/helper/util.go
+++ b/test/kubernetes/testutils/helper/util.go
@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/google/go-github/v32/github"
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	"github.com/kgateway-dev/kgateway/test/testutils"
 	"github.com/kgateway-dev/kgateway/test/testutils/version"
 	. "github.com/onsi/gomega"
@@ -19,7 +20,6 @@ import (
 	"github.com/solo-io/go-utils/changelogutils"
 	"github.com/solo-io/go-utils/githubutils"
 	"github.com/solo-io/go-utils/versionutils"
-	"github.com/solo-io/skv2/codegen/util"
 )
 
 // Deprecated; if this is needed create a resource yaml for it.
@@ -83,7 +83,7 @@ func GetTestHelperForRootDir(ctx context.Context, rootDir, namespace string) (*S
 //   - (nil, nil, err):                      unable to fetch versions for upgrade test
 func GetUpgradeVersions(ctx context.Context, repoName string) (*versionutils.Version, *versionutils.Version, error) {
 	// get the latest and upcoming releases of the current branch
-	files, changelogReadErr := os.ReadDir(filepath.Join(util.GetModuleRoot(), changelogutils.ChangelogDirectory))
+	files, changelogReadErr := os.ReadDir(filepath.Join(fsutils.GetModuleRoot(), changelogutils.ChangelogDirectory))
 	if changelogReadErr != nil {
 		return nil, nil, changelogutils.ReadChangelogDirError(changelogReadErr)
 	}
diff --git a/test/services/envoy/factory.go b/test/services/envoy/factory.go
index 9c1dff9ad06..ba8aa0471c0 100644
--- a/test/services/envoy/factory.go
+++ b/test/services/envoy/factory.go
@@ -18,12 +18,12 @@ import (
 
 	"github.com/kgateway-dev/kgateway/projects/gloo/pkg/defaults"
 
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	"github.com/kgateway-dev/kgateway/test/services/utils"
 	"github.com/kgateway-dev/kgateway/test/testutils"
 	"github.com/kgateway-dev/kgateway/test/testutils/version"
 	"github.com/onsi/ginkgo/v2"
 	errors "github.com/rotisserie/eris"
-	"github.com/solo-io/skv2/codegen/util"
 )
 
 var _ Factory = new(factoryImpl)
@@ -107,7 +107,7 @@ func mustGetEnvoyGlooTag() string {
 		return eit
 	}
 
-	makefile := filepath.Join(util.GetModuleRoot(), "Makefile")
+	makefile := filepath.Join(fsutils.GetModuleRoot(), "Makefile")
 	inFile, err := os.Open(makefile)
 	if err != nil {
 		ginkgo.Fail(errors.Wrapf(err, "failed to open Makefile").Error())
diff --git a/test/testutils/version/changelog.go b/test/testutils/version/changelog.go
index 78d7985c00b..98d984a3078 100644
--- a/test/testutils/version/changelog.go
+++ b/test/testutils/version/changelog.go
@@ -7,10 +7,10 @@ import (
 	"path/filepath"
 	"sort"
 
+	"github.com/kgateway-dev/kgateway/pkg/utils/fsutils"
 	"github.com/pkg/errors"
 	"github.com/solo-io/go-utils/changelogutils"
 	"github.com/solo-io/go-utils/versionutils"
-	"github.com/solo-io/skv2/codegen/util"
 )
 
 // GetLastReleaseOfCurrentBranch returns the Version of the latest patch version for the current minor version
@@ -18,7 +18,7 @@ import (
 // Be aware, that while this has the benefit of not using an external API,
 // we may hit issues where a release failed and therefore the returned version is not actually published.
 func GetLastReleaseOfCurrentBranch() (*versionutils.Version, error) {
-	changelogDir := filepath.Join(util.GetModuleRoot(), "changelog")
+	changelogDir := filepath.Join(fsutils.GetModuleRoot(), "changelog")
 	directoryEntries, err := os.ReadDir(changelogDir)
 	if err != nil {
 		return nil, changelogutils.ReadChangelogDirError(err)