diff --git a/livekit/README.md b/livekit/README.md
new file mode 100644
index 0000000..1fd2893
--- /dev/null
+++ b/livekit/README.md
@@ -0,0 +1 @@
+Generated protobuf stubs
\ No newline at end of file
diff --git a/proto/livekit_analytics.pb.go b/livekit/livekit_analytics.pb.go
similarity index 99%
rename from proto/livekit_analytics.pb.go
rename to livekit/livekit_analytics.pb.go
index b9d5157..bdb3f0c 100644
--- a/proto/livekit_analytics.pb.go
+++ b/livekit/livekit_analytics.pb.go
@@ -637,10 +637,10 @@ var file_livekit_analytics_proto_rawDesc = []byte{
 	0x2e, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x2e, 0x41, 0x6e, 0x61, 0x6c, 0x79, 0x74, 0x69,
 	0x63, 0x73, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
 	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79,
-	0x22, 0x00, 0x28, 0x01, 0x42, 0x2b, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x22, 0x00, 0x28, 0x01, 0x42, 0x25, 0x5a, 0x23, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
 	0x6f, 0x6d, 0x2f, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x63, 0x6f, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69,
-	0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x63, 0x6f, 0x6c, 0x2f, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/proto/livekit_analytics_grpc.pb.go b/livekit/livekit_analytics_grpc.pb.go
similarity index 100%
rename from proto/livekit_analytics_grpc.pb.go
rename to livekit/livekit_analytics_grpc.pb.go
diff --git a/proto/livekit_internal.pb.go b/livekit/livekit_internal.pb.go
similarity index 99%
rename from proto/livekit_internal.pb.go
rename to livekit/livekit_internal.pb.go
index 4567364..28aafc8 100644
--- a/proto/livekit_internal.pb.go
+++ b/livekit/livekit_internal.pb.go
@@ -1528,10 +1528,9 @@ var file_livekit_internal_proto_rawDesc = []byte{
 	0x0a, 0x0b, 0x53, 0x54, 0x41, 0x52, 0x54, 0x49, 0x4e, 0x47, 0x5f, 0x55, 0x50, 0x10, 0x00, 0x12,
 	0x0b, 0x0a, 0x07, 0x53, 0x45, 0x52, 0x56, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d,
 	0x53, 0x48, 0x55, 0x54, 0x54, 0x49, 0x4e, 0x47, 0x5f, 0x44, 0x4f, 0x57, 0x4e, 0x10, 0x02, 0x42,
-	0x2b, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6c, 0x69,
-	0x76, 0x65, 0x6b, 0x69, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x25, 0x5a, 0x23, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6c, 0x69,
+	0x76, 0x65, 0x6b, 0x69, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x6c,
+	0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/proto/livekit_models.pb.go b/livekit/livekit_models.pb.go
similarity index 99%
rename from proto/livekit_models.pb.go
rename to livekit/livekit_models.pb.go
index 28fe82c..e3450b7 100644
--- a/proto/livekit_models.pb.go
+++ b/livekit/livekit_models.pb.go
@@ -1194,10 +1194,10 @@ var file_livekit_models_proto_rawDesc = []byte{
 	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x51, 0x75, 0x61, 0x6c, 0x69, 0x74,
 	0x79, 0x12, 0x08, 0x0a, 0x04, 0x50, 0x4f, 0x4f, 0x52, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x47,
 	0x4f, 0x4f, 0x44, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x45, 0x58, 0x43, 0x45, 0x4c, 0x4c, 0x45,
-	0x4e, 0x54, 0x10, 0x02, 0x42, 0x2b, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x4e, 0x54, 0x10, 0x02, 0x42, 0x25, 0x5a, 0x23, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
 	0x6f, 0x6d, 0x2f, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x63, 0x6f, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69,
-	0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x63, 0x6f, 0x6c, 0x2f, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/proto/livekit_recording.pb.go b/livekit/livekit_recording.pb.go
similarity index 99%
rename from proto/livekit_recording.pb.go
rename to livekit/livekit_recording.pb.go
index 32e4ee1..0934829 100644
--- a/proto/livekit_recording.pb.go
+++ b/livekit/livekit_recording.pb.go
@@ -932,10 +932,10 @@ var file_livekit_recording_proto_rawDesc = []byte{
 	0x1c, 0x2e, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x2e, 0x45, 0x6e, 0x64, 0x52, 0x65, 0x63,
 	0x6f, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e,
 	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x2b, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
+	0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x25, 0x5a, 0x23, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
 	0x63, 0x6f, 0x6d, 0x2f, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6c, 0x69, 0x76, 0x65, 0x6b,
-	0x69, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/proto/livekit_recording.twirp.go b/livekit/livekit_recording.twirp.go
similarity index 97%
rename from proto/livekit_recording.twirp.go
rename to livekit/livekit_recording.twirp.go
index dfed825..8a92931 100644
--- a/proto/livekit_recording.twirp.go
+++ b/livekit/livekit_recording.twirp.go
@@ -1936,33 +1936,33 @@ func callClientError(ctx context.Context, h *twirp.ClientHooks, err twirp.Error)
 }
 
 var twirpFileDescriptor0 = []byte{
-	// 788 bytes of a gzipped FileDescriptorProto
+	// 786 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x5d, 0x6f, 0xf3, 0x34,
-	0x18, 0x5d, 0xda, 0xa6, 0x4d, 0x9e, 0xed, 0xed, 0x5b, 0x3c, 0x28, 0x59, 0x37, 0xa0, 0x84, 0x8b,
-	0x6d, 0x20, 0x75, 0xd5, 0x26, 0x4d, 0x93, 0x90, 0x90, 0xa8, 0xb6, 0xd1, 0x89, 0x69, 0x1f, 0x1e,
+	0x18, 0x5d, 0xda, 0xa6, 0x4d, 0x9e, 0xed, 0xed, 0x5b, 0x3c, 0x28, 0x59, 0x37, 0xa0, 0x64, 0x42,
+	0x1b, 0x5c, 0x74, 0xd5, 0x26, 0x4d, 0x93, 0x90, 0x90, 0xa8, 0xb6, 0xd1, 0x89, 0x69, 0x1f, 0x1e,
 	0xbb, 0xe1, 0x26, 0x4a, 0x1b, 0xb7, 0xb5, 0x48, 0xe2, 0xe0, 0x38, 0x9d, 0xf6, 0x53, 0xf8, 0x19,
 	0xdc, 0xf3, 0xbb, 0xb8, 0x46, 0xb6, 0x93, 0xb4, 0xb4, 0xfb, 0xe0, 0x82, 0xbb, 0x3c, 0xc7, 0xc7,
 	0x27, 0x7e, 0xec, 0x73, 0x6c, 0xf8, 0x3c, 0xa4, 0x73, 0xf2, 0x1b, 0x15, 0x1e, 0x27, 0x63, 0xc6,
 	0x03, 0x1a, 0x4f, 0x7b, 0x09, 0x67, 0x82, 0xa1, 0x46, 0x3e, 0xd0, 0xd9, 0x9d, 0x32, 0x36, 0x0d,
 	0xc9, 0x91, 0x82, 0x47, 0xd9, 0xe4, 0x88, 0x44, 0x89, 0x78, 0xd6, 0x2c, 0xf7, 0x6f, 0x03, 0x3e,
 	0x7b, 0x10, 0x3e, 0x17, 0xb8, 0x98, 0x8e, 0xc9, 0xef, 0x19, 0x49, 0x05, 0x42, 0x50, 0xcd, 0x78,
-	0xe8, 0x18, 0x5d, 0xe3, 0xc0, 0x1e, 0x6e, 0x60, 0x59, 0xa0, 0x33, 0xb0, 0x04, 0x89, 0x92, 0xd0,
-	0x17, 0xc4, 0xa9, 0x74, 0x8d, 0x83, 0xcd, 0xe3, 0x4e, 0x2f, 0xff, 0x4d, 0xaf, 0x14, 0xf8, 0x25,
-	0x67, 0x0c, 0x37, 0x70, 0xc9, 0x46, 0x87, 0x50, 0xe3, 0x22, 0x4a, 0x9c, 0xaa, 0x9a, 0xb5, 0xbd,
-	0x98, 0x25, 0xa2, 0xe4, 0x36, 0x13, 0x49, 0x26, 0x86, 0x06, 0x56, 0x14, 0xb4, 0x07, 0xd6, 0x84,
-	0x86, 0x24, 0xf1, 0xc5, 0xcc, 0xa9, 0xa9, 0xbf, 0x1b, 0xb8, 0x44, 0xd0, 0x09, 0x34, 0x58, 0x22,
-	0x28, 0x8b, 0x53, 0xc7, 0x54, 0x5a, 0x3b, 0xeb, 0x2b, 0xb8, 0xd5, 0x04, 0x5c, 0x30, 0x07, 0x0d,
-	0x30, 0x69, 0x9c, 0x64, 0x62, 0x60, 0x41, 0x9d, 0xa9, 0xbf, 0xb9, 0x63, 0xf8, 0x64, 0x6d, 0xc5,
-	0xa8, 0x0d, 0xf5, 0xd0, 0x7f, 0x66, 0x99, 0xd0, 0x6d, 0xe3, 0xbc, 0x42, 0xbb, 0x60, 0x73, 0xc6,
-	0x22, 0x2f, 0xf6, 0x23, 0xdd, 0xb8, 0x8d, 0x2d, 0x09, 0xdc, 0xf8, 0x11, 0x41, 0x3b, 0x60, 0x8d,
-	0xfc, 0x94, 0x78, 0x72, 0xb7, 0xaa, 0x6a, 0xac, 0x21, 0xeb, 0x47, 0x1e, 0xba, 0x5d, 0x80, 0x45,
-	0x83, 0x08, 0x41, 0x2d, 0xe3, 0x61, 0xea, 0x18, 0xdd, 0xea, 0x81, 0x8d, 0xd5, 0xb7, 0xfb, 0x47,
-	0x05, 0x5a, 0xab, 0xeb, 0x46, 0x7d, 0xa8, 0x27, 0x9c, 0xa4, 0x44, 0x2f, 0xa3, 0x79, 0xec, 0xac,
-	0xb7, 0x78, 0xa7, 0xc6, 0x71, 0xce, 0x43, 0x9f, 0x82, 0xf9, 0x44, 0x03, 0x31, 0x53, 0x8b, 0x33,
-	0xb1, 0x2e, 0x64, 0x3b, 0x33, 0x42, 0xa7, 0x33, 0xa1, 0xd6, 0x65, 0xe2, 0xbc, 0x92, 0xec, 0x80,
-	0x24, 0xf9, 0xf6, 0x9a, 0x58, 0x17, 0x68, 0x0f, 0xec, 0x09, 0xf7, 0x23, 0xc2, 0xe5, 0xe9, 0x9a,
-	0x6a, 0x64, 0x01, 0xa0, 0x6f, 0xe0, 0x83, 0x9f, 0x05, 0x94, 0x79, 0x23, 0x2a, 0x14, 0xa3, 0xae,
-	0x18, 0x5b, 0x0a, 0x1c, 0x68, 0x0c, 0xed, 0xc3, 0x47, 0x4d, 0x9a, 0x70, 0xe9, 0xa2, 0x78, 0xfc,
+	0xe8, 0x18, 0x5d, 0xe3, 0xd0, 0x1e, 0x6e, 0x60, 0x59, 0xa0, 0x33, 0xb0, 0x04, 0x89, 0x92, 0xd0,
+	0x17, 0xc4, 0xa9, 0x74, 0x8d, 0xc3, 0xcd, 0xe3, 0x4e, 0x2f, 0xff, 0x4d, 0xaf, 0x14, 0xf8, 0x25,
+	0x67, 0x0c, 0x37, 0x70, 0xc9, 0x46, 0xdf, 0x42, 0x8d, 0x8b, 0x28, 0x71, 0xaa, 0x6a, 0xd6, 0xf6,
+	0x62, 0x96, 0x88, 0x92, 0xdb, 0x4c, 0x24, 0x99, 0x18, 0x1a, 0x58, 0x51, 0xd0, 0x1e, 0x58, 0x13,
+	0x1a, 0x92, 0xc4, 0x17, 0x33, 0xa7, 0xa6, 0xfe, 0x6e, 0xe0, 0x12, 0x41, 0x27, 0xd0, 0x60, 0x89,
+	0xa0, 0x2c, 0x4e, 0x1d, 0x53, 0x69, 0xed, 0xac, 0xaf, 0xe0, 0x56, 0x13, 0x70, 0xc1, 0x1c, 0x34,
+	0xc0, 0xa4, 0x71, 0x92, 0x89, 0x81, 0x05, 0x75, 0xa6, 0xfe, 0xe6, 0x8e, 0xe1, 0x93, 0xb5, 0x15,
+	0xa3, 0x36, 0xd4, 0x43, 0xff, 0x99, 0x65, 0x42, 0xb7, 0x8d, 0xf3, 0x0a, 0xed, 0x82, 0xcd, 0x19,
+	0x8b, 0xbc, 0xd8, 0x8f, 0x74, 0xe3, 0x36, 0xb6, 0x24, 0x70, 0xe3, 0x47, 0x04, 0xed, 0x80, 0x35,
+	0xf2, 0x53, 0xe2, 0xc9, 0xdd, 0xaa, 0xaa, 0xb1, 0x86, 0xac, 0x1f, 0x79, 0xe8, 0x76, 0x01, 0x16,
+	0x0d, 0x22, 0x04, 0xb5, 0x8c, 0x87, 0xa9, 0x63, 0x74, 0xab, 0x87, 0x36, 0x56, 0xdf, 0xee, 0x1f,
+	0x15, 0x68, 0xad, 0xae, 0x1b, 0xf5, 0xa1, 0x9e, 0x70, 0x92, 0x12, 0xbd, 0x8c, 0xe6, 0xb1, 0xb3,
+	0xde, 0xe2, 0x9d, 0x1a, 0xc7, 0x39, 0x0f, 0x7d, 0x0a, 0xe6, 0x13, 0x0d, 0xc4, 0x4c, 0x2d, 0xce,
+	0xc4, 0xba, 0x90, 0xed, 0xcc, 0x08, 0x9d, 0xce, 0x84, 0x5a, 0x97, 0x89, 0xf3, 0x4a, 0xb2, 0x03,
+	0x92, 0xe4, 0xdb, 0x6b, 0x62, 0x5d, 0xa0, 0x3d, 0xb0, 0x27, 0xdc, 0x8f, 0x08, 0x97, 0xa7, 0x6b,
+	0xaa, 0x91, 0x05, 0x80, 0xf6, 0xe1, 0x83, 0x9f, 0x05, 0x94, 0x79, 0x23, 0x2a, 0x14, 0xa3, 0xae,
+	0x18, 0x5b, 0x0a, 0x1c, 0x68, 0x0c, 0x1d, 0xc0, 0x47, 0x4d, 0x9a, 0x70, 0xe9, 0xa2, 0x78, 0xfc,
 	0xec, 0x34, 0x14, 0xad, 0xa9, 0xe0, 0xcb, 0x02, 0x95, 0x6a, 0x73, 0x1a, 0x90, 0x85, 0x9a, 0xa5,
 	0xd5, 0x14, 0x98, 0xab, 0xb9, 0xdf, 0x43, 0x7b, 0xd5, 0x9a, 0x69, 0xc2, 0xe2, 0x94, 0xa0, 0xaf,
 	0x61, 0xab, 0xb4, 0xbb, 0x47, 0x83, 0xfc, 0xb4, 0x36, 0x4b, 0xec, 0x2a, 0x70, 0xef, 0xa0, 0xf5,
@@ -1971,20 +1971,20 @@ var twirpFileDescriptor0 = []byte{
 	0xb0, 0x7d, 0x11, 0x07, 0x6b, 0xe1, 0xfb, 0x0f, 0x0d, 0xfe, 0x65, 0xc0, 0x87, 0x72, 0xde, 0x55,
 	0x3c, 0x61, 0xa8, 0x09, 0x95, 0x92, 0x5a, 0xa1, 0xc1, 0xdb, 0xae, 0x6d, 0x43, 0xdd, 0x1f, 0x0b,
 	0x3a, 0x27, 0xca, 0x1b, 0x16, 0xce, 0x2b, 0xe9, 0x0d, 0xc2, 0x39, 0xe3, 0x3a, 0x7a, 0x58, 0x17,
-	0x68, 0x1f, 0x6a, 0x32, 0x81, 0x79, 0xe4, 0x16, 0xf1, 0xbd, 0xa4, 0x21, 0xc1, 0x24, 0xcd, 0x42,
+	0xe8, 0x00, 0x6a, 0x32, 0x81, 0x79, 0xe4, 0x16, 0xf1, 0xbd, 0xa4, 0x21, 0xc1, 0x24, 0xcd, 0x42,
 	0x81, 0x15, 0x41, 0x12, 0x55, 0xce, 0xeb, 0xdd, 0xea, 0x5a, 0xce, 0x0b, 0xa2, 0x24, 0xb8, 0x3f,
 	0x03, 0x2c, 0x26, 0xcb, 0x7e, 0x03, 0xf6, 0x14, 0x87, 0xcc, 0x0f, 0xbc, 0xf2, 0xd6, 0xc1, 0x9b,
 	0x05, 0xf6, 0xc8, 0x43, 0xd4, 0x01, 0x2b, 0xc8, 0xb8, 0x2f, 0x13, 0xa2, 0x9a, 0xa9, 0xe2, 0xb2,
 	0x76, 0x7f, 0xd2, 0x39, 0xcb, 0xc5, 0xbe, 0x00, 0x48, 0x05, 0x27, 0x7e, 0xb4, 0x24, 0x65, 0x6b,
-	0xe4, 0x1d, 0xa1, 0x6f, 0xef, 0xe1, 0xe3, 0x4a, 0xc4, 0x90, 0x05, 0xb5, 0x9b, 0xdb, 0x9b, 0x8b,
+	0xe4, 0x1d, 0xa1, 0xef, 0xee, 0xe1, 0xe3, 0x4a, 0xc4, 0x90, 0x05, 0xb5, 0x9b, 0xdb, 0x9b, 0x8b,
 	0xd6, 0x06, 0xb2, 0xc1, 0x1c, 0x9e, 0x7b, 0x27, 0xfd, 0x96, 0x91, 0x7f, 0x9e, 0xf6, 0x5b, 0x15,
 	0xd4, 0x04, 0xb8, 0x7c, 0xbc, 0xbe, 0xf6, 0xf4, 0x50, 0x75, 0xb9, 0x3e, 0xed, 0xb7, 0x6a, 0xc7,
 	0x7f, 0x2e, 0x27, 0xfc, 0x81, 0xf0, 0x39, 0x1d, 0x13, 0x74, 0x0f, 0xcd, 0x7f, 0x5b, 0x1b, 0x7d,
 	0x59, 0x6e, 0xd5, 0x8b, 0xd7, 0x71, 0xe7, 0xab, 0x57, 0xc7, 0xf3, 0x4c, 0xfc, 0x00, 0x76, 0x69,
 	0x78, 0xb4, 0xb8, 0x14, 0x57, 0x43, 0xd0, 0x69, 0xf7, 0xf4, 0x7b, 0xd0, 0x2b, 0xde, 0x83, 0xde,
 	0x85, 0x7c, 0x0f, 0xd0, 0x39, 0x6c, 0x2d, 0xdb, 0x1b, 0xed, 0x2d, 0x5d, 0x3a, 0x6b, 0xae, 0x7f,
-	0x4b, 0x65, 0xd9, 0xcf, 0x4b, 0x2a, 0x2f, 0xd8, 0xfc, 0x35, 0x95, 0xc1, 0x77, 0xbf, 0x1e, 0x4e,
-	0xa9, 0x98, 0x65, 0xa3, 0xde, 0x98, 0x45, 0x47, 0xb9, 0x82, 0x7e, 0xc0, 0xc6, 0x2c, 0xd4, 0x1f,
-	0x05, 0x3c, 0xaa, 0xab, 0xf2, 0xe4, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0x38, 0xea, 0x44,
-	0x0a, 0x07, 0x00, 0x00,
+	0x4b, 0x65, 0xd9, 0xcf, 0x4b, 0x2a, 0x2f, 0xd8, 0xfc, 0x35, 0x95, 0xc1, 0x37, 0xbf, 0xee, 0x4f,
+	0xa9, 0x98, 0x65, 0xa3, 0xde, 0x98, 0x45, 0x47, 0xb9, 0x82, 0x7e, 0xc0, 0xc6, 0x2c, 0x2c, 0x80,
+	0x51, 0x5d, 0x21, 0x27, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x40, 0x23, 0x23, 0xe2, 0x04, 0x07,
+	0x00, 0x00,
 }
diff --git a/proto/livekit_room.pb.go b/livekit/livekit_room.pb.go
similarity index 99%
rename from proto/livekit_room.pb.go
rename to livekit/livekit_room.pb.go
index c4c0d08..0c5166d 100644
--- a/proto/livekit_room.pb.go
+++ b/livekit/livekit_room.pb.go
@@ -1143,10 +1143,9 @@ var file_livekit_room_proto_rawDesc = []byte{
 	0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f,
 	0x6d, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
 	0x1a, 0x0d, 0x2e, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x42,
-	0x2b, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6c, 0x69,
-	0x76, 0x65, 0x6b, 0x69, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x25, 0x5a, 0x23, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6c, 0x69,
+	0x76, 0x65, 0x6b, 0x69, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x6c,
+	0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/proto/livekit_room.twirp.go b/livekit/livekit_room.twirp.go
similarity index 96%
rename from proto/livekit_room.twirp.go
rename to livekit/livekit_room.twirp.go
index aee73a2..bacc8bd 100644
--- a/proto/livekit_room.twirp.go
+++ b/livekit/livekit_room.twirp.go
@@ -3322,59 +3322,59 @@ func (s *roomServiceServer) PathPrefix() string {
 }
 
 var twirpFileDescriptor1 = []byte{
-	// 863 bytes of a gzipped FileDescriptorProto
+	// 862 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x6d, 0x8f, 0xdb, 0x44,
-	0x10, 0x96, 0x7b, 0xb9, 0xab, 0x3d, 0xb9, 0xb7, 0x0c, 0x57, 0x9d, 0xcf, 0xc7, 0x95, 0xc3, 0x45,
-	0x22, 0x15, 0x90, 0x4a, 0xc7, 0x07, 0xf8, 0x80, 0x40, 0x94, 0xa2, 0xea, 0xd4, 0x56, 0x8a, 0x36,
+	0x10, 0x96, 0x7b, 0xb9, 0xab, 0x3d, 0xb9, 0xb7, 0x0c, 0x57, 0x9d, 0xcf, 0xc7, 0x95, 0xc3, 0x07,
+	0x22, 0x48, 0x90, 0x4a, 0xc7, 0x07, 0xf8, 0x80, 0x40, 0x94, 0xa2, 0xea, 0xd4, 0x56, 0x8a, 0x36,
 	0x45, 0xbc, 0x7c, 0x09, 0x1b, 0x7b, 0xa1, 0xab, 0xc4, 0x5e, 0xe3, 0xdd, 0x9c, 0x7a, 0xbf, 0x00,
-	0xf1, 0x0d, 0xf1, 0x23, 0xf8, 0x69, 0xfc, 0x0e, 0xb4, 0x2f, 0xb1, 0x9d, 0xc4, 0x09, 0xe8, 0xbe,
-	0x79, 0x67, 0x66, 0x67, 0x9e, 0x67, 0x66, 0xe7, 0x49, 0x00, 0x67, 0xfc, 0x86, 0x4d, 0xb9, 0x1a,
+	0xf1, 0x0d, 0xf1, 0x23, 0xf8, 0x69, 0xfc, 0x0e, 0xb4, 0x2f, 0xb1, 0x9d, 0xc4, 0x09, 0x55, 0xbf,
+	0x79, 0x67, 0x66, 0x67, 0x9e, 0x67, 0x66, 0xe7, 0x49, 0x00, 0x67, 0xfc, 0x96, 0x4d, 0xb9, 0x1a,
 	0x97, 0x42, 0x64, 0x83, 0xa2, 0x14, 0x4a, 0xe0, 0x7d, 0x67, 0x8b, 0x4e, 0x16, 0xce, 0x4c, 0xa4,
-	0x6c, 0x26, 0xad, 0x3b, 0xfe, 0xd3, 0x83, 0xde, 0x37, 0x25, 0xa3, 0x8a, 0x11, 0x21, 0x32, 0xc2,
-	0x7e, 0x9b, 0x33, 0xa9, 0x10, 0xa1, 0x93, 0xd3, 0x8c, 0x85, 0xde, 0xa5, 0xd7, 0x0f, 0x88, 0xf9,
-	0xc6, 0x47, 0x70, 0xc0, 0xb2, 0x42, 0xdd, 0x8e, 0x15, 0xcf, 0x98, 0x98, 0xab, 0xf0, 0xde, 0xa5,
-	0xd7, 0x3f, 0x20, 0xfb, 0xc6, 0xf8, 0xda, 0xda, 0xf0, 0x31, 0x1c, 0x67, 0xf4, 0xed, 0xb8, 0xa0,
-	0xa5, 0xe2, 0x09, 0x2f, 0x68, 0xae, 0x64, 0xb8, 0x63, 0xe2, 0x8e, 0x32, 0xfa, 0x76, 0xd8, 0x30,
-	0xe3, 0x29, 0xdc, 0xcf, 0x45, 0xca, 0xc6, 0x3c, 0x0d, 0x3b, 0xa6, 0xcc, 0x9e, 0x3e, 0x5e, 0xa7,
-	0x31, 0xc2, 0xf1, 0x4b, 0x2e, 0x95, 0xc6, 0x23, 0x1d, 0xa0, 0xf8, 0x73, 0xe8, 0x35, 0x6c, 0xb2,
-	0x10, 0xb9, 0xd4, 0x88, 0x76, 0x35, 0x51, 0x19, 0x7a, 0x97, 0x3b, 0xfd, 0xee, 0xd5, 0xc1, 0xc0,
-	0x31, 0x1c, 0x18, 0x2a, 0xd6, 0x17, 0x7f, 0x08, 0xbd, 0x67, 0x6c, 0xc6, 0xd6, 0xf8, 0x69, 0xef,
-	0x82, 0x9f, 0xfe, 0x8e, 0x4f, 0x00, 0x9b, 0x81, 0xb6, 0x46, 0xfc, 0x09, 0x9c, 0xea, 0xc2, 0x4d,
-	0xe4, 0xdb, 0x92, 0xfc, 0x00, 0xe1, 0x7a, 0xb8, 0x83, 0xfb, 0x05, 0xec, 0x2f, 0xf5, 0xc5, 0xa2,
-	0x0e, 0x2b, 0xd4, 0x8d, 0x4b, 0xd7, 0xf9, 0x2f, 0x82, 0x2c, 0x45, 0xc7, 0xd7, 0x70, 0xaa, 0x81,
-	0x35, 0x83, 0x52, 0x96, 0x2b, 0xae, 0x6e, 0xdb, 0x80, 0x60, 0x04, 0x3e, 0x77, 0x7e, 0x33, 0xa8,
-	0x80, 0x54, 0xe7, 0xf8, 0x1c, 0xce, 0x08, 0xcb, 0xc4, 0x0d, 0x6b, 0x24, 0xab, 0x08, 0xdf, 0xc2,
-	0xc9, 0xab, 0xb9, 0x6d, 0xc2, 0xeb, 0x92, 0x26, 0xd3, 0x2d, 0x6c, 0xb7, 0x15, 0xc1, 0x73, 0x08,
+	0x6c, 0x26, 0xad, 0x3b, 0xfe, 0xcb, 0x83, 0xde, 0xb7, 0x25, 0xa3, 0x8a, 0x11, 0x21, 0x32, 0xc2,
+	0x7e, 0x9f, 0x33, 0xa9, 0x10, 0xa1, 0x93, 0xd3, 0x8c, 0x85, 0xde, 0xa5, 0xd7, 0x0f, 0x88, 0xf9,
+	0xc6, 0x2b, 0x38, 0x60, 0x59, 0xa1, 0xee, 0xc6, 0x8a, 0x67, 0x4c, 0xcc, 0x55, 0x78, 0xef, 0xd2,
+	0xeb, 0x1f, 0x90, 0x7d, 0x63, 0x7c, 0x69, 0x6d, 0xf8, 0x31, 0x1c, 0x67, 0xf4, 0xf5, 0xb8, 0xa0,
+	0xa5, 0xe2, 0x09, 0x2f, 0x68, 0xae, 0x64, 0xb8, 0x63, 0xe2, 0x8e, 0x32, 0xfa, 0x7a, 0xd8, 0x30,
+	0xe3, 0x29, 0xdc, 0xcf, 0x45, 0xca, 0xc6, 0x3c, 0x0d, 0x3b, 0xa6, 0xcc, 0x9e, 0x3e, 0xde, 0xa4,
+	0x31, 0xc2, 0xf1, 0x73, 0x2e, 0x95, 0xc6, 0x23, 0x1d, 0xa0, 0xf8, 0x0b, 0xe8, 0x35, 0x6c, 0xb2,
+	0x10, 0xb9, 0xd4, 0x88, 0x76, 0x35, 0x51, 0x19, 0x7a, 0x97, 0x3b, 0xfd, 0xee, 0xf5, 0xc1, 0xc0,
+	0x31, 0x1c, 0x18, 0x2a, 0xd6, 0x17, 0x7f, 0x04, 0xbd, 0x27, 0x6c, 0xc6, 0xd6, 0xf8, 0x69, 0xef,
+	0x82, 0x9f, 0xfe, 0x8e, 0x4f, 0x00, 0x9b, 0x81, 0xb6, 0x46, 0xfc, 0x29, 0x9c, 0xea, 0xc2, 0x4d,
+	0xe4, 0xdb, 0x92, 0xfc, 0x08, 0xe1, 0x7a, 0xb8, 0x83, 0xfb, 0x25, 0xec, 0x2f, 0xf5, 0xc5, 0xa2,
+	0x0e, 0x2b, 0xd4, 0x8d, 0x4b, 0x37, 0xf9, 0xaf, 0x82, 0x2c, 0x45, 0xc7, 0x37, 0x70, 0xaa, 0x81,
+	0x35, 0x83, 0x52, 0x96, 0x2b, 0xae, 0xee, 0xda, 0x80, 0x60, 0x04, 0x3e, 0x77, 0x7e, 0x33, 0xa8,
+	0x80, 0x54, 0xe7, 0xf8, 0x1c, 0xce, 0x08, 0xcb, 0xc4, 0x2d, 0x6b, 0x24, 0xab, 0x08, 0xdf, 0xc1,
+	0xc9, 0x8b, 0xb9, 0x6d, 0xc2, 0xcb, 0x92, 0x26, 0xd3, 0x2d, 0x6c, 0xb7, 0x15, 0xc1, 0x73, 0x08,
 	0x94, 0xbe, 0x3f, 0x96, 0x3c, 0x35, 0x4f, 0x20, 0x20, 0xbe, 0x31, 0x8c, 0x78, 0x8a, 0x27, 0xb0,
-	0x9b, 0xcd, 0x15, 0xb3, 0x93, 0xf7, 0x89, 0x3d, 0xc4, 0x5f, 0xc3, 0x83, 0x95, 0xd2, 0xae, 0x73,
-	0x7d, 0xd8, 0x35, 0x57, 0x4d, 0xf1, 0xee, 0x15, 0x56, 0x2d, 0x33, 0x61, 0xa6, 0x59, 0x36, 0x20,
-	0xfe, 0xdd, 0x83, 0x07, 0x0d, 0x56, 0x43, 0x56, 0x66, 0x5c, 0x4a, 0x2e, 0x72, 0xfd, 0x7c, 0x13,
+	0x9b, 0xcd, 0x15, 0xb3, 0x93, 0xf7, 0x89, 0x3d, 0xc4, 0xdf, 0xc0, 0x83, 0x95, 0xd2, 0xae, 0x73,
+	0x7d, 0xd8, 0x35, 0x57, 0x4d, 0xf1, 0xee, 0x35, 0x56, 0x2d, 0x33, 0x61, 0xa6, 0x59, 0x36, 0x20,
+	0xfe, 0xc3, 0x83, 0x07, 0x0d, 0x56, 0x43, 0x56, 0x66, 0x5c, 0x4a, 0x2e, 0x72, 0xfd, 0x7c, 0x13,
 	0x9a, 0x8f, 0xe5, 0x7c, 0x22, 0x93, 0x92, 0x4f, 0xec, 0xdb, 0xf6, 0xc9, 0x7e, 0x42, 0xf3, 0xd1,
-	0xc2, 0x86, 0xef, 0x41, 0x57, 0x07, 0x15, 0xf3, 0xc9, 0x8c, 0xcb, 0x37, 0x86, 0x93, 0x4f, 0x20,
+	0xc2, 0x86, 0xef, 0x41, 0x57, 0x07, 0x15, 0xf3, 0xc9, 0x8c, 0xcb, 0x57, 0x86, 0x93, 0x4f, 0x20,
 	0xa1, 0xf9, 0xd0, 0x5a, 0xb0, 0x0f, 0xc7, 0x8d, 0x80, 0x71, 0x4a, 0x15, 0x35, 0xe4, 0x7c, 0x72,
-	0x58, 0x47, 0x3d, 0xa3, 0x8a, 0xc6, 0x7f, 0x7b, 0x10, 0x7e, 0x57, 0xa4, 0x54, 0x2d, 0x77, 0xf9,
-	0x6e, 0xcd, 0x8c, 0xc0, 0xcf, 0x98, 0xa2, 0x55, 0xb9, 0x80, 0x54, 0x67, 0xfc, 0x12, 0xa0, 0xa8,
-	0x68, 0x9a, 0x86, 0x76, 0xaf, 0x1e, 0xb6, 0x3d, 0xaa, 0xba, 0x19, 0xa4, 0x71, 0x23, 0xfe, 0xc3,
-	0x83, 0xc8, 0x02, 0x75, 0x7d, 0x28, 0x14, 0x17, 0xb9, 0xbc, 0x2b, 0xd4, 0x0b, 0x80, 0x6a, 0xee,
-	0x7a, 0xf7, 0x77, 0xfa, 0x01, 0x09, 0x16, 0x83, 0x97, 0xf8, 0x2e, 0x04, 0xf5, 0x08, 0xec, 0xf4,
-	0x6b, 0x43, 0x7c, 0x01, 0xe7, 0xad, 0x50, 0xdc, 0xdb, 0xfc, 0xcb, 0x83, 0xa3, 0x11, 0xcb, 0x53,
-	0xdd, 0xe0, 0x6d, 0xf8, 0x10, 0x3a, 0xa6, 0x55, 0x1a, 0xdb, 0x3e, 0x31, 0xdf, 0xf8, 0x31, 0x74,
-	0xa6, 0x3c, 0xb7, 0x4f, 0xf1, 0xb0, 0xb1, 0x75, 0x3a, 0xd7, 0x90, 0x26, 0x53, 0xa6, 0x06, 0x2f,
-	0x78, 0x9e, 0x12, 0x13, 0xa5, 0x75, 0x2c, 0x65, 0x52, 0xf1, 0x9c, 0x6a, 0x04, 0x96, 0x4b, 0xc7,
-	0x70, 0x39, 0x6a, 0xd8, 0x35, 0x23, 0x2d, 0x57, 0x35, 0x26, 0x07, 0xf4, 0x05, 0x9c, 0x59, 0x1e,
-	0xfa, 0x2d, 0xbf, 0x72, 0x93, 0xfa, 0x8f, 0x8e, 0x56, 0x03, 0xbe, 0xb7, 0x3c, 0xe0, 0xab, 0x7f,
-	0xf6, 0xa0, 0xab, 0xf3, 0x8c, 0x58, 0x79, 0xc3, 0x13, 0x86, 0x9f, 0x01, 0xd4, 0x8a, 0x8d, 0x51,
-	0xc5, 0x64, 0x4d, 0xc6, 0xa3, 0x65, 0x45, 0xc4, 0xa7, 0x10, 0x54, 0x22, 0x8a, 0x67, 0x95, 0x6f,
-	0x55, 0x6c, 0xa3, 0xa8, 0xcd, 0xe5, 0x56, 0xf1, 0x5b, 0x80, 0x5a, 0x25, 0x1b, 0xc5, 0xd7, 0x34,
-	0x36, 0x3a, 0x6f, 0xf5, 0xb9, 0x34, 0xdf, 0x5b, 0x8d, 0x5f, 0xfa, 0x41, 0xb8, 0x5c, 0x2a, 0xdb,
-	0xa2, 0xb8, 0xd1, 0xfb, 0x5b, 0x22, 0x5c, 0xe2, 0x97, 0x70, 0xf8, 0x9c, 0x35, 0x5d, 0x8d, 0xb4,
-	0x1b, 0xf4, 0x33, 0xda, 0x28, 0xc1, 0xf8, 0x23, 0xf4, 0xd6, 0x94, 0xf2, 0x7f, 0x24, 0x8c, 0xeb,
-	0x88, 0x4d, 0x3a, 0x8b, 0x23, 0x40, 0x2d, 0x76, 0x4e, 0x32, 0x58, 0x6a, 0xa4, 0x0c, 0x2f, 0xaa,
-	0x9b, 0x6d, 0x22, 0x1c, 0x3d, 0xdc, 0xe4, 0x76, 0x49, 0x87, 0xd0, 0x5b, 0xd3, 0x1c, 0xac, 0xbb,
-	0xb6, 0x49, 0x8f, 0xb6, 0x74, 0xe0, 0x67, 0x78, 0xa7, 0x65, 0x23, 0xf1, 0xd1, 0x4a, 0xce, 0x36,
-	0xe9, 0x88, 0x3e, 0xd8, 0x1e, 0xe4, 0x30, 0x7f, 0x05, 0xfe, 0x62, 0x7f, 0xb0, 0xc6, 0xb1, 0xb2,
-	0xe6, 0xd1, 0x59, 0x8b, 0xc7, 0x25, 0x78, 0x0e, 0xb8, 0xbe, 0x6c, 0x18, 0xaf, 0x14, 0x6f, 0xd9,
-	0xc4, 0x95, 0xfd, 0x78, 0xfa, 0xd1, 0x4f, 0x8f, 0x7f, 0xe5, 0xea, 0xcd, 0x7c, 0x32, 0x48, 0x44,
-	0xf6, 0xc4, 0xb9, 0x9e, 0x98, 0xff, 0x49, 0x89, 0x98, 0xd9, 0x8f, 0x85, 0x79, 0xb2, 0x67, 0x8e,
-	0x9f, 0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x89, 0x94, 0x00, 0x14, 0x74, 0x09, 0x00, 0x00,
+	0x58, 0x47, 0x3d, 0xa1, 0x8a, 0xc6, 0xff, 0x78, 0x10, 0x7e, 0x5f, 0xa4, 0x54, 0x2d, 0x77, 0xf9,
+	0xed, 0x9a, 0x19, 0x81, 0x9f, 0x31, 0x45, 0xab, 0x72, 0x01, 0xa9, 0xce, 0xf8, 0x15, 0x40, 0x51,
+	0xd1, 0x34, 0x0d, 0xed, 0x5e, 0x3f, 0x6c, 0x7b, 0x54, 0x75, 0x33, 0x48, 0xe3, 0x46, 0xfc, 0xa7,
+	0x07, 0x91, 0x05, 0xea, 0xfa, 0x50, 0x28, 0x2e, 0x72, 0xf9, 0xb6, 0x50, 0x2f, 0x00, 0xaa, 0xb9,
+	0xeb, 0xdd, 0xdf, 0xe9, 0x07, 0x24, 0x58, 0x0c, 0x5e, 0xe2, 0xbb, 0x10, 0xd4, 0x23, 0xb0, 0xd3,
+	0xaf, 0x0d, 0xf1, 0x05, 0x9c, 0xb7, 0x42, 0x71, 0x6f, 0xf3, 0x6f, 0x0f, 0x8e, 0x46, 0x2c, 0x4f,
+	0x75, 0x83, 0xb7, 0xe1, 0x43, 0xe8, 0x98, 0x56, 0x69, 0x6c, 0xfb, 0xc4, 0x7c, 0xe3, 0x27, 0xd0,
+	0x99, 0xf2, 0xdc, 0x3e, 0xc5, 0xc3, 0xc6, 0xd6, 0xe9, 0x5c, 0x43, 0x9a, 0x4c, 0x99, 0x1a, 0x3c,
+	0xe3, 0x79, 0x4a, 0x4c, 0x94, 0xd6, 0xb1, 0x94, 0x49, 0xc5, 0x73, 0xaa, 0x11, 0x58, 0x2e, 0x1d,
+	0xc3, 0xe5, 0xa8, 0x61, 0xd7, 0x8c, 0xb4, 0x5c, 0xd5, 0x98, 0x1c, 0xd0, 0x67, 0x70, 0x66, 0x79,
+	0xe8, 0xb7, 0xfc, 0xc2, 0x4d, 0xea, 0x7f, 0x3a, 0x5a, 0x0d, 0xf8, 0xde, 0xf2, 0x80, 0xaf, 0xff,
+	0xdd, 0x83, 0xae, 0xce, 0x33, 0x62, 0xe5, 0x2d, 0x4f, 0x18, 0x7e, 0x0e, 0x50, 0x2b, 0x36, 0x46,
+	0x15, 0x93, 0x35, 0x19, 0x8f, 0x96, 0x15, 0x11, 0x1f, 0x43, 0x50, 0x89, 0x28, 0x9e, 0x55, 0xbe,
+	0x55, 0xb1, 0x8d, 0xa2, 0x36, 0x97, 0x5b, 0xc5, 0xef, 0x00, 0x6a, 0x95, 0x6c, 0x14, 0x5f, 0xd3,
+	0xd8, 0xe8, 0xbc, 0xd5, 0xe7, 0xd2, 0xfc, 0x60, 0x35, 0x7e, 0xe9, 0x07, 0xe1, 0x72, 0xa9, 0x6c,
+	0x8b, 0xe2, 0x46, 0xef, 0x6f, 0x89, 0x70, 0x89, 0x9f, 0xc3, 0xe1, 0x53, 0xd6, 0x74, 0x35, 0xd2,
+	0x6e, 0xd0, 0xcf, 0x68, 0xa3, 0x04, 0xe3, 0x4f, 0xd0, 0x5b, 0x53, 0xca, 0x37, 0x48, 0x18, 0xd7,
+	0x11, 0x9b, 0x74, 0x16, 0x47, 0x80, 0x5a, 0xec, 0x9c, 0x64, 0xb0, 0xd4, 0x48, 0x19, 0x5e, 0x54,
+	0x37, 0xdb, 0x44, 0x38, 0x7a, 0xb8, 0xc9, 0xed, 0x92, 0x0e, 0xa1, 0xb7, 0xa6, 0x39, 0x58, 0x77,
+	0x6d, 0x93, 0x1e, 0x6d, 0xe9, 0xc0, 0x2f, 0xf0, 0x4e, 0xcb, 0x46, 0xe2, 0xd5, 0x4a, 0xce, 0x36,
+	0xe9, 0x88, 0x3e, 0xd8, 0x1e, 0xe4, 0x30, 0x7f, 0x0d, 0xfe, 0x62, 0x7f, 0xb0, 0xc6, 0xb1, 0xb2,
+	0xe6, 0xd1, 0x59, 0x8b, 0xc7, 0x25, 0x78, 0x0a, 0xb8, 0xbe, 0x6c, 0x18, 0xaf, 0x14, 0x6f, 0xd9,
+	0xc4, 0x95, 0xfd, 0x78, 0xfc, 0xe1, 0xcf, 0x57, 0xbf, 0x71, 0xf5, 0x6a, 0x3e, 0x19, 0x24, 0x22,
+	0x7b, 0xe4, 0x5c, 0x8f, 0xcc, 0xff, 0xa4, 0x44, 0xcc, 0x16, 0x86, 0xc9, 0x9e, 0xb1, 0x7c, 0xf6,
+	0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x95, 0x17, 0xfa, 0xf3, 0x6e, 0x09, 0x00, 0x00,
 }
diff --git a/proto/livekit_rtc.pb.go b/livekit/livekit_rtc.pb.go
similarity index 99%
rename from proto/livekit_rtc.pb.go
rename to livekit/livekit_rtc.pb.go
index 7ae9897..0278422 100644
--- a/proto/livekit_rtc.pb.go
+++ b/livekit/livekit_rtc.pb.go
@@ -1845,10 +1845,10 @@ var file_livekit_rtc_proto_rawDesc = []byte{
 	0x55, 0x42, 0x53, 0x43, 0x52, 0x49, 0x42, 0x45, 0x52, 0x10, 0x01, 0x2a, 0x25, 0x0a, 0x0b, 0x53,
 	0x74, 0x72, 0x65, 0x61, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0a, 0x0a, 0x06, 0x41, 0x43,
 	0x54, 0x49, 0x56, 0x45, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x50, 0x41, 0x55, 0x53, 0x45, 0x44,
-	0x10, 0x01, 0x42, 0x2b, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
+	0x10, 0x01, 0x42, 0x25, 0x5a, 0x23, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
 	0x2f, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f,
-	0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6c, 0x2f, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
diff --git a/proto/livekit_webhook.pb.go b/livekit/livekit_webhook.pb.go
similarity index 96%
rename from proto/livekit_webhook.pb.go
rename to livekit/livekit_webhook.pb.go
index 7c3f112..6b6c945 100644
--- a/proto/livekit_webhook.pb.go
+++ b/livekit/livekit_webhook.pb.go
@@ -114,10 +114,10 @@ var file_livekit_webhook_proto_rawDesc = []byte{
 	0x6e, 0x67, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e,
 	0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x69, 0x6e,
 	0x67, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0d, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x67,
-	0x49, 0x6e, 0x66, 0x6f, 0x42, 0x2b, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x49, 0x6e, 0x66, 0x6f, 0x42, 0x25, 0x5a, 0x23, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
 	0x6f, 0x6d, 0x2f, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x63, 0x6f, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69,
-	0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x63, 0x6f, 0x6c, 0x2f, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/livekit_analytics.proto b/livekit_analytics.proto
index 8bab84b..7fff820 100644
--- a/livekit_analytics.proto
+++ b/livekit_analytics.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package livekit;
-option go_package = "github.com/livekit/protocol/proto/livekit";
+option go_package = "github.com/livekit/protocol/livekit";
 
 import "google/protobuf/empty.proto";
 import "google/protobuf/timestamp.proto";
diff --git a/livekit_internal.proto b/livekit_internal.proto
index dad6126..7d806e5 100644
--- a/livekit_internal.proto
+++ b/livekit_internal.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package livekit;
-option go_package = "github.com/livekit/protocol/proto/livekit";
+option go_package = "github.com/livekit/protocol/livekit";
 
 // internal protos, not exposed to clients
 import "livekit_recording.proto";
diff --git a/livekit_models.proto b/livekit_models.proto
index 6501b70..8c5c5d5 100644
--- a/livekit_models.proto
+++ b/livekit_models.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package livekit;
-option go_package = "github.com/livekit/protocol/proto/livekit";
+option go_package = "github.com/livekit/protocol/livekit";
 
 message Room {
   string sid = 1;
diff --git a/livekit_recording.proto b/livekit_recording.proto
index 81a2b13..cd8746d 100644
--- a/livekit_recording.proto
+++ b/livekit_recording.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package livekit;
-option go_package = "github.com/livekit/protocol/proto/livekit";
+option go_package = "github.com/livekit/protocol/livekit";
 
 import "google/protobuf/empty.proto";
 
diff --git a/livekit_room.proto b/livekit_room.proto
index 67a1f1e..72f1c10 100644
--- a/livekit_room.proto
+++ b/livekit_room.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package livekit;
-option go_package = "github.com/livekit/protocol/proto/livekit";
+option go_package = "github.com/livekit/protocol/livekit";
 
 import "livekit_models.proto";
 
diff --git a/livekit_rtc.proto b/livekit_rtc.proto
index b03f83f..ae829e9 100644
--- a/livekit_rtc.proto
+++ b/livekit_rtc.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package livekit;
-option go_package = "github.com/livekit/protocol/proto/livekit";
+option go_package = "github.com/livekit/protocol/livekit";
 
 import "livekit_models.proto";
 
diff --git a/livekit_webhook.proto b/livekit_webhook.proto
index 6ee3810..d0cae88 100644
--- a/livekit_webhook.proto
+++ b/livekit_webhook.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package livekit;
-option go_package = "github.com/livekit/protocol/proto/livekit";
+option go_package = "github.com/livekit/protocol/livekit";
 
 import "livekit_models.proto";
 import "livekit_recording.proto";
diff --git a/magefile.go b/magefile.go
index cec6a9f..9f33d91 100644
--- a/magefile.go
+++ b/magefile.go
@@ -9,32 +9,26 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-
-	"github.com/magefile/mage/target"
 )
 
 var Default = Proto
 
 // regenerate protobuf
 func Proto() error {
-	updated, err := target.Path("proto/livekit_models.pb.go",
-		"livekit_internal.proto",
-		"livekit_models.proto",
+	twirpProtoFiles := []string{
 		"livekit_recording.proto",
 		"livekit_room.proto",
+	}
+	grpcProtoFiles := []string{
+		"livekit_analytics.proto",
+		"livekit_internal.proto",
+		"livekit_models.proto",
 		"livekit_rtc.proto",
 		"livekit_webhook.proto",
-		"livekit_analytics.proto",
-	)
-	if err != nil {
-		return err
-	}
-	if !updated {
-		return nil
 	}
 
 	fmt.Println("generating protobuf")
-	target := "proto"
+	target := "livekit"
 	if err := os.MkdirAll(target, 0755); err != nil {
 		return err
 	}
@@ -51,48 +45,40 @@ func Proto() error {
 	if err != nil {
 		return err
 	}
-
 	protocGrpcGoPath, err := getToolPath("protoc-gen-go-grpc")
 	if err != nil {
 		return err
 	}
-	// generate twirp-related protos
-	cmd := exec.Command(protoc,
+	fmt.Println("generating twirp protobuf")
+	args := append([]string{
 		"--go_out", target,
 		"--twirp_out", target,
 		"--go_opt=paths=source_relative",
 		"--twirp_opt=paths=source_relative",
-		"--plugin=go="+protocGoPath,
-		"--plugin=twirp="+twirpPath,
+		"--plugin=go=" + protocGoPath,
+		"--plugin=twirp=" + twirpPath,
 		"-I=.",
-		"livekit_recording.proto",
-		"livekit_room.proto",
-	)
+	}, twirpProtoFiles...)
+	cmd := exec.Command(protoc, args...)
 	connectStd(cmd)
 	if err := cmd.Run(); err != nil {
 		return err
 	}
-
-	// generate basic protobuf
-	cmd = exec.Command(protoc,
+	fmt.Println("generating grpc protobuf")
+	args = append([]string{
 		"--go_out", target,
 		"--go-grpc_out", target,
 		"--go_opt=paths=source_relative",
 		"--go-grpc_opt=paths=source_relative",
-		"--plugin=go="+protocGoPath,
-		"--plugin=go-grpc="+protocGrpcGoPath,
+		"--plugin=go=" + protocGoPath,
+		"--plugin=go-grpc=" + protocGrpcGoPath,
 		"-I=.",
-		"livekit_internal.proto",
-		"livekit_models.proto",
-		"livekit_rtc.proto",
-		"livekit_webhook.proto",
-		"livekit_analytics.proto",
-	)
+	}, grpcProtoFiles...)
+	cmd = exec.Command(protoc, args...)
 	connectStd(cmd)
 	if err := cmd.Run(); err != nil {
 		return err
 	}
-
 	return nil
 }
 
diff --git a/recording/request.go b/recording/request.go
index f551f97..4b3cd04 100644
--- a/recording/request.go
+++ b/recording/request.go
@@ -7,7 +7,7 @@ import (
 
 	"google.golang.org/protobuf/proto"
 
-	livekit "github.com/livekit/protocol/proto"
+	"github.com/livekit/protocol/livekit"
 	"github.com/livekit/protocol/utils"
 )