diff --git a/.gitmodules b/.gitmodules
index c756d587fe..138219ce77 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "examples/proto/api-common-protos"]
-	path = examples/proto/api-common-protos
+[submodule "proto/api-common-protos"]
+	path = proto/api-common-protos
 	url = https://github.com/googleapis/api-common-protos
diff --git a/Makefile b/Makefile
index 846c7ab731..36bbdfddb2 100644
--- a/Makefile
+++ b/Makefile
@@ -26,8 +26,8 @@ include tools/protoc/rules.mk
 include tools/semantic-release/rules.mk
 include tools/stringer/rules.mk
 
-.PHONY: examples/proto/api-common-protos
-examples/proto/api-common-protos:
+.PHONY: proto/api-common-protos
+proto/api-common-protos:
 	@git submodule update --init --recursive $@
 
 .PHONY: go-generate
@@ -53,12 +53,12 @@ api-linter-lint: $(api_linter_wrapper)
 	$(info [$@] linting APIs...)
 	@$(api_linter_wrapper) \
 		--config api-linter.yaml \
-		-I examples/proto/api-common-protos \
-		-I examples/proto/src \
-		$(shell find examples/proto/src -type f -name '*.proto' | cut -d '/' -f 4-)
+		-I proto/api-common-protos \
+		-I proto/src \
+		$(shell find proto/src -type f -name '*.proto' | cut -d '/' -f 4-)
 
 .PHONY: buf-lint
-buf-lint: $(buf) examples/proto/api-common-protos
+buf-lint: $(buf) proto/api-common-protos
 	$(info [$@] linting protobuf schemas...)
 	@$(buf) lint
 
@@ -68,7 +68,7 @@ protoc_plugins := \
 	$(protoc_gen_gapic_validator)
 
 .PHONY: buf-generate
-buf-generate: $(buf) $(protoc) $(protoc_plugins) examples/proto/api-common-protos
+buf-generate: $(buf) $(protoc) $(protoc_plugins) proto/api-common-protos
 	$(info [$@] generating protobuf stubs...)
-	@rm -rf examples/proto/gen
-	@$(buf) generate --path examples/proto/src/einride
+	@rm -rf proto/gen
+	@$(buf) generate --path proto/src/einride
diff --git a/aipmiddleware/parentvalidator_test.go b/aipmiddleware/parentvalidator_test.go
index 595544cc1c..1e7bce14be 100644
--- a/aipmiddleware/parentvalidator_test.go
+++ b/aipmiddleware/parentvalidator_test.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"testing"
 
-	examplefreightv1 "go.einride.tech/aip/examples/proto/gen/einride/example/freight/v1"
+	examplefreightv1 "go.einride.tech/aip/proto/gen/einride/example/freight/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/buf.gen.yaml b/buf.gen.yaml
index 5ce5293330..075d90c623 100644
--- a/buf.gen.yaml
+++ b/buf.gen.yaml
@@ -5,9 +5,9 @@ plugins:
     out: .
 
   - name: go
-    out: examples/proto/gen
-    opt: module=go.einride.tech/aip/examples/proto/gen
+    out: proto/gen
+    opt: module=go.einride.tech/aip/proto/gen
 
   - name: go-grpc
-    out: examples/proto/gen
-    opt: module=go.einride.tech/aip/examples/proto/gen,require_unimplemented_servers=false
+    out: proto/gen
+    opt: module=go.einride.tech/aip/proto/gen,require_unimplemented_servers=false
diff --git a/buf.yaml b/buf.yaml
index e643299fac..896bef656a 100644
--- a/buf.yaml
+++ b/buf.yaml
@@ -2,8 +2,8 @@ version: v1beta1
 
 build:
   roots:
-    - examples/proto/src
-    - examples/proto/api-common-protos
+    - proto/src
+    - proto/api-common-protos
 
 lint:
   use:
diff --git a/examples/proto/api-common-protos b/examples/proto/api-common-protos
deleted file mode 160000
index 0fcae75a2c..0000000000
--- a/examples/proto/api-common-protos
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0fcae75a2c20a140137e3a9c48a87d15ceffabd7
diff --git a/fieldbehavior/fieldbehavior_test.go b/fieldbehavior/fieldbehavior_test.go
index d1b71afb20..69667bfc35 100644
--- a/fieldbehavior/fieldbehavior_test.go
+++ b/fieldbehavior/fieldbehavior_test.go
@@ -3,7 +3,7 @@ package fieldbehavior
 import (
 	"testing"
 
-	examplefreightv1 "go.einride.tech/aip/examples/proto/gen/einride/example/freight/v1"
+	examplefreightv1 "go.einride.tech/aip/proto/gen/einride/example/freight/v1"
 	"google.golang.org/genproto/googleapis/api/annotations"
 	"google.golang.org/genproto/googleapis/example/library/v1"
 	"google.golang.org/protobuf/types/known/fieldmaskpb"
diff --git a/fieldmask/update_test.go b/fieldmask/update_test.go
index e65937ef4a..74a025b349 100644
--- a/fieldmask/update_test.go
+++ b/fieldmask/update_test.go
@@ -3,7 +3,7 @@ package fieldmask
 import (
 	"testing"
 
-	syntaxv1 "go.einride.tech/aip/examples/proto/gen/einride/example/syntax/v1"
+	syntaxv1 "go.einride.tech/aip/proto/gen/einride/example/syntax/v1"
 	"google.golang.org/genproto/googleapis/example/library/v1"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/testing/protocmp"
diff --git a/filtering/checker_test.go b/filtering/checker_test.go
index cc065e03a4..679211cbcc 100644
--- a/filtering/checker_test.go
+++ b/filtering/checker_test.go
@@ -3,7 +3,7 @@ package filtering
 import (
 	"testing"
 
-	syntaxv1 "go.einride.tech/aip/examples/proto/gen/einride/example/syntax/v1"
+	syntaxv1 "go.einride.tech/aip/proto/gen/einride/example/syntax/v1"
 	"gotest.tools/v3/assert"
 )
 
diff --git a/proto/api-common-protos b/proto/api-common-protos
new file mode 160000
index 0000000000..f37c0ecc55
--- /dev/null
+++ b/proto/api-common-protos
@@ -0,0 +1 @@
+Subproject commit f37c0ecc55f19b1675448e4bad70fd45c93f5b8f
diff --git a/examples/proto/gen/einride/example/freight/v1/freight_service.pb.go b/proto/gen/einride/example/freight/v1/freight_service.pb.go
similarity index 99%
rename from examples/proto/gen/einride/example/freight/v1/freight_service.pb.go
rename to proto/gen/einride/example/freight/v1/freight_service.pb.go
index 65f7e58a0d..175782879e 100644
--- a/examples/proto/gen/einride/example/freight/v1/freight_service.pb.go
+++ b/proto/gen/einride/example/freight/v1/freight_service.pb.go
@@ -1381,16 +1381,16 @@ var file_einride_example_freight_v1_freight_service_proto_rawDesc = []byte{
 	0x65, 0x72, 0x73, 0x2f, 0x2a, 0x2f, 0x73, 0x68, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f,
 	0x2a, 0x7d, 0x1a, 0x1f, 0xca, 0x41, 0x1c, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2d, 0x65,
 	0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2e, 0x74,
-	0x65, 0x63, 0x68, 0x42, 0x8c, 0x01, 0x0a, 0x1f, 0x74, 0x65, 0x63, 0x68, 0x2e, 0x65, 0x69, 0x6e,
+	0x65, 0x63, 0x68, 0x42, 0x83, 0x01, 0x0a, 0x1f, 0x74, 0x65, 0x63, 0x68, 0x2e, 0x65, 0x69, 0x6e,
 	0x72, 0x69, 0x64, 0x65, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x66, 0x72, 0x65,
 	0x69, 0x67, 0x68, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x13, 0x46, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x52,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x49,
 	0x67, 0x6f, 0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2e, 0x74, 0x65, 0x63, 0x68, 0x2f,
-	0x61, 0x69, 0x70, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2f, 0x65,
-	0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2f, 0x76,
-	0x31, 0x3b, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74,
-	0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x69, 0x70, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x69,
+	0x6e, 0x72, 0x69, 0x64, 0x65, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x66, 0x72,
+	0x65, 0x69, 0x67, 0x68, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65,
+	0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
diff --git a/examples/proto/gen/einride/example/freight/v1/freight_service_grpc.pb.go b/proto/gen/einride/example/freight/v1/freight_service_grpc.pb.go
similarity index 100%
rename from examples/proto/gen/einride/example/freight/v1/freight_service_grpc.pb.go
rename to proto/gen/einride/example/freight/v1/freight_service_grpc.pb.go
diff --git a/examples/proto/gen/einride/example/freight/v1/shipment.pb.go b/proto/gen/einride/example/freight/v1/shipment.pb.go
similarity index 95%
rename from examples/proto/gen/einride/example/freight/v1/shipment.pb.go
rename to proto/gen/einride/example/freight/v1/shipment.pb.go
index d6a80f2791..54ebf8363c 100644
--- a/examples/proto/gen/einride/example/freight/v1/shipment.pb.go
+++ b/proto/gen/einride/example/freight/v1/shipment.pb.go
@@ -346,16 +346,15 @@ var file_einride_example_freight_v1_shipment_proto_rawDesc = []byte{
 	0x5f, 0x6b, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x02, 0x52, 0x08, 0x77, 0x65, 0x69, 0x67, 0x68,
 	0x74, 0x4b, 0x67, 0x12, 0x1b, 0x0a, 0x09, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x5f, 0x6d, 0x33,
 	0x18, 0x04, 0x20, 0x01, 0x28, 0x02, 0x52, 0x08, 0x76, 0x6f, 0x6c, 0x75, 0x6d, 0x65, 0x4d, 0x33,
-	0x42, 0x86, 0x01, 0x0a, 0x1f, 0x74, 0x65, 0x63, 0x68, 0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64,
-	0x65, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68,
-	0x74, 0x2e, 0x76, 0x31, 0x42, 0x0d, 0x53, 0x68, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x52, 0x67, 0x6f, 0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64,
-	0x65, 0x2e, 0x74, 0x65, 0x63, 0x68, 0x2f, 0x61, 0x69, 0x70, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70,
-	0x6c, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x69,
-	0x6e, 0x72, 0x69, 0x64, 0x65, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x66, 0x72,
-	0x65, 0x69, 0x67, 0x68, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65,
-	0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x42, 0x7d, 0x0a, 0x1f, 0x74, 0x65, 0x63, 0x68, 0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65,
+	0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74,
+	0x2e, 0x76, 0x31, 0x42, 0x0d, 0x53, 0x68, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x49, 0x67, 0x6f, 0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65,
+	0x2e, 0x74, 0x65, 0x63, 0x68, 0x2f, 0x61, 0x69, 0x70, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f,
+	0x67, 0x65, 0x6e, 0x2f, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2f, 0x65, 0x78, 0x61, 0x6d,
+	0x70, 0x6c, 0x65, 0x2f, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x65,
+	0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x76, 0x31, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/examples/proto/gen/einride/example/freight/v1/shipper.pb.go b/proto/gen/einride/example/freight/v1/shipper.pb.go
similarity index 91%
rename from examples/proto/gen/einride/example/freight/v1/shipper.pb.go
rename to proto/gen/einride/example/freight/v1/shipper.pb.go
index 342ce76f00..52f6abe7bf 100644
--- a/examples/proto/gen/einride/example/freight/v1/shipper.pb.go
+++ b/proto/gen/einride/example/freight/v1/shipper.pb.go
@@ -151,16 +151,15 @@ var file_einride_example_freight_v1_shipper_proto_rawDesc = []byte{
 	0x65, 0x2e, 0x74, 0x65, 0x63, 0x68, 0x2f, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65, 0x72, 0x12, 0x12,
 	0x73, 0x68, 0x69, 0x70, 0x70, 0x65, 0x72, 0x73, 0x2f, 0x7b, 0x73, 0x68, 0x69, 0x70, 0x70, 0x65,
 	0x72, 0x7d, 0x2a, 0x08, 0x73, 0x68, 0x69, 0x70, 0x70, 0x65, 0x72, 0x73, 0x32, 0x07, 0x73, 0x68,
-	0x69, 0x70, 0x70, 0x65, 0x72, 0x42, 0x85, 0x01, 0x0a, 0x1f, 0x74, 0x65, 0x63, 0x68, 0x2e, 0x65,
-	0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x66,
-	0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x0c, 0x53, 0x68, 0x69, 0x70, 0x70,
-	0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x52, 0x67, 0x6f, 0x2e, 0x65, 0x69,
-	0x6e, 0x72, 0x69, 0x64, 0x65, 0x2e, 0x74, 0x65, 0x63, 0x68, 0x2f, 0x61, 0x69, 0x70, 0x2f, 0x65,
-	0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65,
-	0x6e, 0x2f, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c,
-	0x65, 0x2f, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x78, 0x61,
-	0x6d, 0x70, 0x6c, 0x65, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x76, 0x31, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x69, 0x70, 0x70, 0x65, 0x72, 0x42, 0x7c, 0x0a, 0x1f, 0x74, 0x65, 0x63, 0x68, 0x2e, 0x65, 0x69,
+	0x6e, 0x72, 0x69, 0x64, 0x65, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x66, 0x72,
+	0x65, 0x69, 0x67, 0x68, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x0c, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65,
+	0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x49, 0x67, 0x6f, 0x2e, 0x65, 0x69, 0x6e,
+	0x72, 0x69, 0x64, 0x65, 0x2e, 0x74, 0x65, 0x63, 0x68, 0x2f, 0x61, 0x69, 0x70, 0x2f, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2f,
+	0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2f,
+	0x76, 0x31, 0x3b, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68,
+	0x74, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/examples/proto/gen/einride/example/freight/v1/site.pb.go b/proto/gen/einride/example/freight/v1/site.pb.go
similarity index 92%
rename from examples/proto/gen/einride/example/freight/v1/site.pb.go
rename to proto/gen/einride/example/freight/v1/site.pb.go
index ce923e4179..0b15297dfe 100644
--- a/examples/proto/gen/einride/example/freight/v1/site.pb.go
+++ b/proto/gen/einride/example/freight/v1/site.pb.go
@@ -166,16 +166,15 @@ var file_einride_example_freight_v1_site_proto_rawDesc = []byte{
 	0x69, 0x64, 0x65, 0x2e, 0x74, 0x65, 0x63, 0x68, 0x2f, 0x53, 0x69, 0x74, 0x65, 0x12, 0x1f, 0x73,
 	0x68, 0x69, 0x70, 0x70, 0x65, 0x72, 0x73, 0x2f, 0x7b, 0x73, 0x68, 0x69, 0x70, 0x70, 0x65, 0x72,
 	0x7d, 0x2f, 0x73, 0x69, 0x74, 0x65, 0x73, 0x2f, 0x7b, 0x73, 0x69, 0x74, 0x65, 0x7d, 0x2a, 0x05,
-	0x73, 0x69, 0x74, 0x65, 0x73, 0x32, 0x04, 0x73, 0x69, 0x74, 0x65, 0x42, 0x82, 0x01, 0x0a, 0x1f,
-	0x74, 0x65, 0x63, 0x68, 0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2e, 0x65, 0x78, 0x61,
-	0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2e, 0x76, 0x31, 0x42,
-	0x09, 0x53, 0x69, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x52, 0x67, 0x6f,
-	0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2e, 0x74, 0x65, 0x63, 0x68, 0x2f, 0x61, 0x69,
-	0x70, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2f, 0x65, 0x78, 0x61,
-	0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2f, 0x76, 0x31, 0x3b,
-	0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x76, 0x31,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x73, 0x69, 0x74, 0x65, 0x73, 0x32, 0x04, 0x73, 0x69, 0x74, 0x65, 0x42, 0x79, 0x0a, 0x1f, 0x74,
+	0x65, 0x63, 0x68, 0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+	0x70, 0x6c, 0x65, 0x2e, 0x66, 0x72, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x09,
+	0x53, 0x69, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x49, 0x67, 0x6f, 0x2e,
+	0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2e, 0x74, 0x65, 0x63, 0x68, 0x2f, 0x61, 0x69, 0x70,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x69, 0x6e, 0x72, 0x69,
+	0x64, 0x65, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x66, 0x72, 0x65, 0x69, 0x67,
+	0x68, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x66, 0x72, 0x65,
+	0x69, 0x67, 0x68, 0x74, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/examples/proto/gen/einride/example/syntax/v1/syntax.pb.go b/proto/gen/einride/example/syntax/v1/syntax.pb.go
similarity index 98%
rename from examples/proto/gen/einride/example/syntax/v1/syntax.pb.go
rename to proto/gen/einride/example/syntax/v1/syntax.pb.go
index 2708c2d6e5..6ddf2d7cf4 100644
--- a/examples/proto/gen/einride/example/syntax/v1/syntax.pb.go
+++ b/proto/gen/einride/example/syntax/v1/syntax.pb.go
@@ -609,15 +609,14 @@ var file_einride_example_syntax_v1_syntax_proto_rawDesc = []byte{
 	0x10, 0x45, 0x4e, 0x55, 0x4d, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45,
 	0x44, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x45, 0x4e, 0x55, 0x4d, 0x5f, 0x4f, 0x4e, 0x45, 0x10,
 	0x01, 0x12, 0x0c, 0x0a, 0x08, 0x45, 0x4e, 0x55, 0x4d, 0x5f, 0x54, 0x57, 0x4f, 0x10, 0x02, 0x42,
-	0x7a, 0x0a, 0x1e, 0x74, 0x65, 0x63, 0x68, 0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2e,
+	0x71, 0x0a, 0x1e, 0x74, 0x65, 0x63, 0x68, 0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2e,
 	0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x73, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x2e, 0x76,
 	0x31, 0x42, 0x0b, 0x53, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x49, 0x67, 0x6f, 0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2e, 0x74, 0x65, 0x63,
-	0x68, 0x2f, 0x61, 0x69, 0x70, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x2f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65,
-	0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x73, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x2f,
-	0x76, 0x31, 0x3b, 0x73, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x5a, 0x40, 0x67, 0x6f, 0x2e, 0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2e, 0x74, 0x65, 0x63,
+	0x68, 0x2f, 0x61, 0x69, 0x70, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f,
+	0x65, 0x69, 0x6e, 0x72, 0x69, 0x64, 0x65, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2f,
+	0x73, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x79, 0x6e, 0x74, 0x61, 0x78,
+	0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/examples/proto/src/einride/example/freight/v1/freight_service.proto b/proto/src/einride/example/freight/v1/freight_service.proto
similarity index 99%
rename from examples/proto/src/einride/example/freight/v1/freight_service.proto
rename to proto/src/einride/example/freight/v1/freight_service.proto
index 68408ba9b4..617f972bfc 100644
--- a/examples/proto/src/einride/example/freight/v1/freight_service.proto
+++ b/proto/src/einride/example/freight/v1/freight_service.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package einride.example.freight.v1;
 
-option go_package = "go.einride.tech/aip/examples/proto/gen/einride/example/freight/v1;examplefreightv1";
+option go_package = "go.einride.tech/aip/proto/gen/einride/example/freight/v1;examplefreightv1";
 option java_multiple_files = true;
 option java_outer_classname = "FreightServiceProto";
 option java_package = "tech.einride.example.freight.v1";
diff --git a/examples/proto/src/einride/example/freight/v1/shipment.proto b/proto/src/einride/example/freight/v1/shipment.proto
similarity index 96%
rename from examples/proto/src/einride/example/freight/v1/shipment.proto
rename to proto/src/einride/example/freight/v1/shipment.proto
index 346d8f71bc..1e57dec4c9 100644
--- a/examples/proto/src/einride/example/freight/v1/shipment.proto
+++ b/proto/src/einride/example/freight/v1/shipment.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package einride.example.freight.v1;
 
-option go_package = "go.einride.tech/aip/examples/proto/gen/einride/example/freight/v1;examplefreightv1";
+option go_package = "go.einride.tech/aip/proto/gen/einride/example/freight/v1;examplefreightv1";
 option java_multiple_files = true;
 option java_outer_classname = "ShipmentProto";
 option java_package = "tech.einride.example.freight.v1";
diff --git a/examples/proto/src/einride/example/freight/v1/shipper.proto b/proto/src/einride/example/freight/v1/shipper.proto
similarity index 92%
rename from examples/proto/src/einride/example/freight/v1/shipper.proto
rename to proto/src/einride/example/freight/v1/shipper.proto
index ac319cf81f..9f260db9a4 100644
--- a/examples/proto/src/einride/example/freight/v1/shipper.proto
+++ b/proto/src/einride/example/freight/v1/shipper.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package einride.example.freight.v1;
 
-option go_package = "go.einride.tech/aip/examples/proto/gen/einride/example/freight/v1;examplefreightv1";
+option go_package = "go.einride.tech/aip/proto/gen/einride/example/freight/v1;examplefreightv1";
 option java_multiple_files = true;
 option java_outer_classname = "ShipperProto";
 option java_package = "tech.einride.example.freight.v1";
diff --git a/examples/proto/src/einride/example/freight/v1/site.proto b/proto/src/einride/example/freight/v1/site.proto
similarity index 92%
rename from examples/proto/src/einride/example/freight/v1/site.proto
rename to proto/src/einride/example/freight/v1/site.proto
index d6d5c01b33..d07e1af770 100644
--- a/examples/proto/src/einride/example/freight/v1/site.proto
+++ b/proto/src/einride/example/freight/v1/site.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package einride.example.freight.v1;
 
-option go_package = "go.einride.tech/aip/examples/proto/gen/einride/example/freight/v1;examplefreightv1";
+option go_package = "go.einride.tech/aip/proto/gen/einride/example/freight/v1;examplefreightv1";
 option java_multiple_files = true;
 option java_outer_classname = "SiteProto";
 option java_package = "tech.einride.example.freight.v1";
diff --git a/examples/proto/src/einride/example/syntax/v1/syntax.proto b/proto/src/einride/example/syntax/v1/syntax.proto
similarity index 94%
rename from examples/proto/src/einride/example/syntax/v1/syntax.proto
rename to proto/src/einride/example/syntax/v1/syntax.proto
index a1b62dce17..40ef35de03 100644
--- a/examples/proto/src/einride/example/syntax/v1/syntax.proto
+++ b/proto/src/einride/example/syntax/v1/syntax.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package einride.example.syntax.v1;
 
-option go_package = "go.einride.tech/aip/examples/proto/gen/einride/example/syntax/v1;syntaxv1";
+option go_package = "go.einride.tech/aip/proto/gen/einride/example/syntax/v1;syntaxv1";
 option java_multiple_files = true;
 option java_outer_classname = "SyntaxProto";
 option java_package = "tech.einride.example.syntax.v1";
diff --git a/reflect/aipreflect/resourcedescriptor_test.go b/reflect/aipreflect/resourcedescriptor_test.go
index 104e1375ec..7332143fde 100644
--- a/reflect/aipreflect/resourcedescriptor_test.go
+++ b/reflect/aipreflect/resourcedescriptor_test.go
@@ -3,7 +3,7 @@ package aipreflect
 import (
 	"testing"
 
-	examplefreightv1 "go.einride.tech/aip/examples/proto/gen/einride/example/freight/v1"
+	examplefreightv1 "go.einride.tech/aip/proto/gen/einride/example/freight/v1"
 	"google.golang.org/genproto/googleapis/api/annotations"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
diff --git a/reflect/aipregistry/resources_test.go b/reflect/aipregistry/resources_test.go
index 692642f907..40f10d23cc 100644
--- a/reflect/aipregistry/resources_test.go
+++ b/reflect/aipregistry/resources_test.go
@@ -3,7 +3,7 @@ package aipregistry
 import (
 	"testing"
 
-	examplefreightv1 "go.einride.tech/aip/examples/proto/gen/einride/example/freight/v1"
+	examplefreightv1 "go.einride.tech/aip/proto/gen/einride/example/freight/v1"
 	"go.einride.tech/aip/reflect/aipreflect"
 	"google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/reflect/protoregistry"