diff --git a/BUILD b/BUILD
index 1a65a88f..7a1db4f4 100644
--- a/BUILD
+++ b/BUILD
@@ -81,13 +81,7 @@ proto_library(
         "//contrib/envoy/extensions/filters/http/squash/v3:pkg",
         "//contrib/envoy/extensions/filters/http/sxg/v3alpha:pkg",
         "//contrib/envoy/extensions/filters/network/client_ssl_auth/v3:pkg",
-        "//contrib/envoy/extensions/filters/network/generic_proxy/action/v3:pkg",
-        "//contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3:pkg",
-        "//contrib/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3:pkg",
         "//contrib/envoy/extensions/filters/network/generic_proxy/codecs/kafka/v3:pkg",
-        "//contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3:pkg",
-        "//contrib/envoy/extensions/filters/network/generic_proxy/router/v3:pkg",
-        "//contrib/envoy/extensions/filters/network/generic_proxy/v3:pkg",
         "//contrib/envoy/extensions/filters/network/golang/v3alpha:pkg",
         "//contrib/envoy/extensions/filters/network/kafka_broker/v3:pkg",
         "//contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha:pkg",
@@ -230,6 +224,12 @@ proto_library(
         "//envoy/extensions/filters/network/dubbo_proxy/v3:pkg",
         "//envoy/extensions/filters/network/echo/v3:pkg",
         "//envoy/extensions/filters/network/ext_authz/v3:pkg",
+        "//envoy/extensions/filters/network/generic_proxy/action/v3:pkg",
+        "//envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3:pkg",
+        "//envoy/extensions/filters/network/generic_proxy/codecs/http1/v3:pkg",
+        "//envoy/extensions/filters/network/generic_proxy/matcher/v3:pkg",
+        "//envoy/extensions/filters/network/generic_proxy/router/v3:pkg",
+        "//envoy/extensions/filters/network/generic_proxy/v3:pkg",
         "//envoy/extensions/filters/network/http_connection_manager/v3:pkg",
         "//envoy/extensions/filters/network/local_ratelimit/v3:pkg",
         "//envoy/extensions/filters/network/mongo_proxy/v3:pkg",
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/action/v3/BUILD b/envoy/extensions/filters/network/generic_proxy/action/v3/BUILD
similarity index 100%
rename from contrib/envoy/extensions/filters/network/generic_proxy/action/v3/BUILD
rename to envoy/extensions/filters/network/generic_proxy/action/v3/BUILD
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/action/v3/action.proto b/envoy/extensions/filters/network/generic_proxy/action/v3/action.proto
similarity index 95%
rename from contrib/envoy/extensions/filters/network/generic_proxy/action/v3/action.proto
rename to envoy/extensions/filters/network/generic_proxy/action/v3/action.proto
index d7c3dd04..3e1b7a79 100644
--- a/contrib/envoy/extensions/filters/network/generic_proxy/action/v3/action.proto
+++ b/envoy/extensions/filters/network/generic_proxy/action/v3/action.proto
@@ -16,7 +16,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.generic_proxy.action.v3";
 option java_outer_classname = "ActionProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/action/v3;actionv3";
+option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/action/v3;actionv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/BUILD b/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/BUILD
similarity index 100%
rename from contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/BUILD
rename to envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/BUILD
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.proto b/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.proto
similarity index 81%
rename from contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.proto
rename to envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.proto
index 47a2af15..d5b6782e 100644
--- a/contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.proto
+++ b/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.proto
@@ -9,7 +9,7 @@ import "udpa/annotations/status.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.generic_proxy.codecs.dubbo.v3";
 option java_outer_classname = "DubboProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3;dubbov3";
+option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3;dubbov3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/BUILD b/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/BUILD
similarity index 100%
rename from contrib/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/BUILD
rename to envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/BUILD
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.proto b/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.proto
similarity index 94%
rename from contrib/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.proto
rename to envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.proto
index 973a190d..2a57db60 100644
--- a/contrib/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.proto
+++ b/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.proto
@@ -11,7 +11,7 @@ import "udpa/annotations/status.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.generic_proxy.codecs.http1.v3";
 option java_outer_classname = "Http1Proto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3;http1v3";
+option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3;http1v3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3/BUILD b/envoy/extensions/filters/network/generic_proxy/matcher/v3/BUILD
similarity index 100%
rename from contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3/BUILD
rename to envoy/extensions/filters/network/generic_proxy/matcher/v3/BUILD
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.proto b/envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.proto
similarity index 95%
rename from contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.proto
rename to envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.proto
index 2490a0b9..13990866 100644
--- a/contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.proto
+++ b/envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.proto
@@ -12,7 +12,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.generic_proxy.matcher.v3";
 option java_outer_classname = "MatcherProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3;matcherv3";
+option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/matcher/v3;matcherv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/router/v3/BUILD b/envoy/extensions/filters/network/generic_proxy/router/v3/BUILD
similarity index 100%
rename from contrib/envoy/extensions/filters/network/generic_proxy/router/v3/BUILD
rename to envoy/extensions/filters/network/generic_proxy/router/v3/BUILD
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/router/v3/router.proto b/envoy/extensions/filters/network/generic_proxy/router/v3/router.proto
similarity index 93%
rename from contrib/envoy/extensions/filters/network/generic_proxy/router/v3/router.proto
rename to envoy/extensions/filters/network/generic_proxy/router/v3/router.proto
index a7064152..67f14fec 100644
--- a/contrib/envoy/extensions/filters/network/generic_proxy/router/v3/router.proto
+++ b/envoy/extensions/filters/network/generic_proxy/router/v3/router.proto
@@ -9,7 +9,7 @@ import "udpa/annotations/status.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.generic_proxy.router.v3";
 option java_outer_classname = "RouterProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/router/v3;routerv3";
+option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/router/v3;routerv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/v3/BUILD b/envoy/extensions/filters/network/generic_proxy/v3/BUILD
similarity index 100%
rename from contrib/envoy/extensions/filters/network/generic_proxy/v3/BUILD
rename to envoy/extensions/filters/network/generic_proxy/v3/BUILD
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.proto b/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.proto
similarity index 92%
rename from contrib/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.proto
rename to envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.proto
index 7e35eabd..9ae25604 100644
--- a/contrib/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.proto
+++ b/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.proto
@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package envoy.extensions.filters.network.generic_proxy.v3;
 
-import "contrib/envoy/extensions/filters/network/generic_proxy/v3/route.proto";
 import "envoy/config/accesslog/v3/accesslog.proto";
 import "envoy/config/core/v3/config_source.proto";
 import "envoy/config/core/v3/extension.proto";
+import "envoy/extensions/filters/network/generic_proxy/v3/route.proto";
 import "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto";
 
 import "xds/annotations/v3/status.proto";
@@ -16,7 +16,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.generic_proxy.v3";
 option java_outer_classname = "GenericProxyProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/v3;generic_proxyv3";
+option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/v3;generic_proxyv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/v3/route.proto b/envoy/extensions/filters/network/generic_proxy/v3/route.proto
similarity index 97%
rename from contrib/envoy/extensions/filters/network/generic_proxy/v3/route.proto
rename to envoy/extensions/filters/network/generic_proxy/v3/route.proto
index 2ac8b0f9..c2982661 100644
--- a/contrib/envoy/extensions/filters/network/generic_proxy/v3/route.proto
+++ b/envoy/extensions/filters/network/generic_proxy/v3/route.proto
@@ -11,7 +11,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.generic_proxy.v3";
 option java_outer_classname = "RouteProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/generic_proxy/v3;generic_proxyv3";
+option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/v3;generic_proxyv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 
diff --git a/versioning/BUILD b/versioning/BUILD
index 97772178..96791470 100644
--- a/versioning/BUILD
+++ b/versioning/BUILD
@@ -19,13 +19,7 @@ proto_library(
         "//contrib/envoy/extensions/filters/http/squash/v3:pkg",
         "//contrib/envoy/extensions/filters/http/sxg/v3alpha:pkg",
         "//contrib/envoy/extensions/filters/network/client_ssl_auth/v3:pkg",
-        "//contrib/envoy/extensions/filters/network/generic_proxy/action/v3:pkg",
-        "//contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3:pkg",
-        "//contrib/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3:pkg",
         "//contrib/envoy/extensions/filters/network/generic_proxy/codecs/kafka/v3:pkg",
-        "//contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3:pkg",
-        "//contrib/envoy/extensions/filters/network/generic_proxy/router/v3:pkg",
-        "//contrib/envoy/extensions/filters/network/generic_proxy/v3:pkg",
         "//contrib/envoy/extensions/filters/network/golang/v3alpha:pkg",
         "//contrib/envoy/extensions/filters/network/kafka_broker/v3:pkg",
         "//contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha:pkg",
@@ -168,6 +162,12 @@ proto_library(
         "//envoy/extensions/filters/network/dubbo_proxy/v3:pkg",
         "//envoy/extensions/filters/network/echo/v3:pkg",
         "//envoy/extensions/filters/network/ext_authz/v3:pkg",
+        "//envoy/extensions/filters/network/generic_proxy/action/v3:pkg",
+        "//envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3:pkg",
+        "//envoy/extensions/filters/network/generic_proxy/codecs/http1/v3:pkg",
+        "//envoy/extensions/filters/network/generic_proxy/matcher/v3:pkg",
+        "//envoy/extensions/filters/network/generic_proxy/router/v3:pkg",
+        "//envoy/extensions/filters/network/generic_proxy/v3:pkg",
         "//envoy/extensions/filters/network/http_connection_manager/v3:pkg",
         "//envoy/extensions/filters/network/local_ratelimit/v3:pkg",
         "//envoy/extensions/filters/network/mongo_proxy/v3:pkg",