diff --git a/temporal/api/command/v1/message.proto b/temporal/api/v1/command_message.proto
similarity index 97%
rename from temporal/api/command/v1/message.proto
rename to temporal/api/v1/command_message.proto
index 5bce9e4d9..558140a79 100644
--- a/temporal/api/command/v1/message.proto
+++ b/temporal/api/v1/command_message.proto
@@ -29,17 +29,17 @@ option java_package = "io.temporal.api.command.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::Command::V1";
-option csharp_namespace = "Temporal.Api.Command.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 import "google/protobuf/duration.proto";
 
 import "dependencies/gogoproto/gogo.proto";
 
-import "temporal/api/enums/v1/workflow.proto";
-import "temporal/api/enums/v1/command_type.proto";
-import "temporal/api/common/v1/message.proto";
-import "temporal/api/failure/v1/message.proto";
-import "temporal/api/taskqueue/v1/message.proto";
+import "temporal/api/v1/enums_workflow.proto";
+import "temporal/api/v1/enums_command_type.proto";
+import "temporal/api/v1/common_message.proto";
+import "temporal/api/v1/failure_message.proto";
+import "temporal/api/v1/taskqueue_message.proto";
 
 message ScheduleActivityTaskCommandAttributes {
     string activity_id = 1;
diff --git a/temporal/api/common/v1/message.proto b/temporal/api/v1/common_message.proto
similarity index 97%
rename from temporal/api/common/v1/message.proto
rename to temporal/api/v1/common_message.proto
index 5364a758e..42cb3ba05 100644
--- a/temporal/api/common/v1/message.proto
+++ b/temporal/api/v1/common_message.proto
@@ -29,13 +29,13 @@ option java_package = "io.temporal.api.common.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::Common::V1";
-option csharp_namespace = "Temporal.Api.Common.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 import "google/protobuf/duration.proto";
 
 import "dependencies/gogoproto/gogo.proto";
 
-import "temporal/api/enums/v1/common.proto";
+import "temporal/api/v1/enums_common.proto";
 
 message DataBlob {
     temporal.api.enums.v1.EncodingType encoding_type = 1;
diff --git a/temporal/api/enums/v1/command_type.proto b/temporal/api/v1/enums_command_type.proto
similarity index 97%
rename from temporal/api/enums/v1/command_type.proto
rename to temporal/api/v1/enums_command_type.proto
index dfe6e1eee..c8516da03 100644
--- a/temporal/api/enums/v1/command_type.proto
+++ b/temporal/api/v1/enums_command_type.proto
@@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
 option java_multiple_files = true;
 option java_outer_classname = "CommandTypeProto";
 option ruby_package = "Temporal::Api::Enums::V1";
-option csharp_namespace = "Temporal.Api.Enums.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 // Whenever this list of command types is changed do change the function shouldBufferEvent in mutableStateBuilder.go to make sure to do the correct event ordering.
 enum CommandType {
diff --git a/temporal/api/enums/v1/common.proto b/temporal/api/v1/enums_common.proto
similarity index 96%
rename from temporal/api/enums/v1/common.proto
rename to temporal/api/v1/enums_common.proto
index d0d90bbb6..86465e49f 100644
--- a/temporal/api/enums/v1/common.proto
+++ b/temporal/api/v1/enums_common.proto
@@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
 option java_multiple_files = true;
 option java_outer_classname = "CommonProto";
 option ruby_package = "Temporal::Api::Enums::V1";
-option csharp_namespace = "Temporal.Api.Enums.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 enum EncodingType {
     ENCODING_TYPE_UNSPECIFIED = 0;
diff --git a/temporal/api/enums/v1/event_type.proto b/temporal/api/v1/enums_event_type.proto
similarity index 99%
rename from temporal/api/enums/v1/event_type.proto
rename to temporal/api/v1/enums_event_type.proto
index e7f95368c..8225f4ebc 100644
--- a/temporal/api/enums/v1/event_type.proto
+++ b/temporal/api/v1/enums_event_type.proto
@@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
 option java_multiple_files = true;
 option java_outer_classname = "EventTypeProto";
 option ruby_package = "Temporal::Api::Enums::V1";
-option csharp_namespace = "Temporal.Api.Enums.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 // Whenever this list of events is changed do change the function shouldBufferEvent in mutableStateBuilder.go to make sure to do the correct event ordering
 enum EventType {
diff --git a/temporal/api/enums/v1/failed_cause.proto b/temporal/api/v1/enums_failed_cause.proto
similarity index 98%
rename from temporal/api/enums/v1/failed_cause.proto
rename to temporal/api/v1/enums_failed_cause.proto
index 2e22f5ac8..f59182729 100644
--- a/temporal/api/enums/v1/failed_cause.proto
+++ b/temporal/api/v1/enums_failed_cause.proto
@@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
 option java_multiple_files = true;
 option java_outer_classname = "FailedCauseProto";
 option ruby_package = "Temporal::Api::Enums::V1";
-option csharp_namespace = "Temporal.Api.Enums.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 // Workflow tasks can fail for various reasons. Note that some of these reasons can only originate
 // from the server, and some of them can only originate from the SDK/worker.
diff --git a/temporal/api/enums/v1/namespace.proto b/temporal/api/v1/enums_namespace.proto
similarity index 96%
rename from temporal/api/enums/v1/namespace.proto
rename to temporal/api/v1/enums_namespace.proto
index 9af741442..a3a800afa 100644
--- a/temporal/api/enums/v1/namespace.proto
+++ b/temporal/api/v1/enums_namespace.proto
@@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
 option java_multiple_files = true;
 option java_outer_classname = "NamespaceProto";
 option ruby_package = "Temporal::Api::Enums::V1";
-option csharp_namespace = "Temporal.Api.Enums.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 enum NamespaceState {
     NAMESPACE_STATE_UNSPECIFIED = 0;
diff --git a/temporal/api/enums/v1/query.proto b/temporal/api/v1/enums_query.proto
similarity index 97%
rename from temporal/api/enums/v1/query.proto
rename to temporal/api/v1/enums_query.proto
index efcebb43c..ec3a7fb9f 100644
--- a/temporal/api/enums/v1/query.proto
+++ b/temporal/api/v1/enums_query.proto
@@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
 option java_multiple_files = true;
 option java_outer_classname = "QueryProto";
 option ruby_package = "Temporal::Api::Enums::V1";
-option csharp_namespace = "Temporal.Api.Enums.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 enum QueryResultType {
     QUERY_RESULT_TYPE_UNSPECIFIED = 0;
diff --git a/temporal/api/enums/v1/reset.proto b/temporal/api/v1/enums_reset.proto
similarity index 96%
rename from temporal/api/enums/v1/reset.proto
rename to temporal/api/v1/enums_reset.proto
index 6b7c637c7..e1f50a580 100644
--- a/temporal/api/enums/v1/reset.proto
+++ b/temporal/api/v1/enums_reset.proto
@@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
 option java_multiple_files = true;
 option java_outer_classname = "ResetProto";
 option ruby_package = "Temporal::Api::Enums::V1";
-option csharp_namespace = "Temporal.Api.Enums.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 // TODO: What is this?
 enum ResetReapplyType {
diff --git a/temporal/api/enums/v1/task_queue.proto b/temporal/api/v1/enums_task_queue.proto
similarity index 97%
rename from temporal/api/enums/v1/task_queue.proto
rename to temporal/api/v1/enums_task_queue.proto
index 54f6d4792..7c604e0b0 100644
--- a/temporal/api/enums/v1/task_queue.proto
+++ b/temporal/api/v1/enums_task_queue.proto
@@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
 option java_multiple_files = true;
 option java_outer_classname = "TaskQueueProto";
 option ruby_package = "Temporal::Api::Enums::V1";
-option csharp_namespace = "Temporal.Api.Enums.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 enum TaskQueueKind {
     TASK_QUEUE_KIND_UNSPECIFIED = 0;
diff --git a/temporal/api/enums/v1/workflow.proto b/temporal/api/v1/enums_workflow.proto
similarity index 98%
rename from temporal/api/enums/v1/workflow.proto
rename to temporal/api/v1/enums_workflow.proto
index 142ca117a..6ced6f126 100644
--- a/temporal/api/enums/v1/workflow.proto
+++ b/temporal/api/v1/enums_workflow.proto
@@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
 option java_multiple_files = true;
 option java_outer_classname = "WorkflowProto";
 option ruby_package = "Temporal::Api::Enums::V1";
-option csharp_namespace = "Temporal.Api.Enums.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 // Defines how new runs of a workflow with a particular ID may or may not be allowed. Note that
 // it is *never* valid to have two actively running instances of the same workflow id.
diff --git a/temporal/api/errordetails/v1/message.proto b/temporal/api/v1/errordetails_message.proto
similarity index 94%
rename from temporal/api/errordetails/v1/message.proto
rename to temporal/api/v1/errordetails_message.proto
index 421fa36e6..37f582f35 100644
--- a/temporal/api/errordetails/v1/message.proto
+++ b/temporal/api/v1/errordetails_message.proto
@@ -32,10 +32,10 @@ option java_package = "io.temporal.api.errordetails.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::ErrorDetails::V1";
-option csharp_namespace = "Temporal.Api.ErrorDetails.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel.ErrorDetails";
 
-import "temporal/api/common/v1/message.proto";
-import "temporal/api/enums/v1/failed_cause.proto";
+import "temporal/api/v1/common_message.proto";
+import "temporal/api/v1/enums_failed_cause.proto";
 
 message NotFoundFailure {
     string current_cluster = 1;
diff --git a/temporal/api/failure/v1/message.proto b/temporal/api/v1/failure_message.proto
similarity index 95%
rename from temporal/api/failure/v1/message.proto
rename to temporal/api/v1/failure_message.proto
index 79eeaec89..16824984c 100644
--- a/temporal/api/failure/v1/message.proto
+++ b/temporal/api/v1/failure_message.proto
@@ -29,10 +29,10 @@ option java_package = "io.temporal.api.failure.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::Failure::V1";
-option csharp_namespace = "Temporal.Api.Failure.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
-import "temporal/api/common/v1/message.proto";
-import "temporal/api/enums/v1/workflow.proto";
+import "temporal/api/v1/common_message.proto";
+import "temporal/api/v1/enums_workflow.proto";
 
 message ApplicationFailureInfo {
     string type = 1;
diff --git a/temporal/api/filter/v1/message.proto b/temporal/api/v1/filter_message.proto
similarity index 94%
rename from temporal/api/filter/v1/message.proto
rename to temporal/api/v1/filter_message.proto
index c00f80f68..0ab8eb83f 100644
--- a/temporal/api/filter/v1/message.proto
+++ b/temporal/api/v1/filter_message.proto
@@ -29,13 +29,13 @@ option java_package = "io.temporal.api.filter.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::Filter::V1";
-option csharp_namespace = "Temporal.Api.Filter.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 import "google/protobuf/timestamp.proto";
 
 import "dependencies/gogoproto/gogo.proto";
 
-import "temporal/api/enums/v1/workflow.proto";
+import "temporal/api/v1/enums_workflow.proto";
 
 message WorkflowExecutionFilter {
     string workflow_id = 1;
diff --git a/temporal/api/history/v1/message.proto b/temporal/api/v1/history_message.proto
similarity index 98%
rename from temporal/api/history/v1/message.proto
rename to temporal/api/v1/history_message.proto
index 2cf44dd24..da2073dbd 100644
--- a/temporal/api/history/v1/message.proto
+++ b/temporal/api/v1/history_message.proto
@@ -29,20 +29,20 @@ option java_package = "io.temporal.api.history.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::History::V1";
-option csharp_namespace = "Temporal.Api.History.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 
 import "dependencies/gogoproto/gogo.proto";
 
-import "temporal/api/enums/v1/event_type.proto";
-import "temporal/api/enums/v1/failed_cause.proto";
-import "temporal/api/enums/v1/workflow.proto";
-import "temporal/api/common/v1/message.proto";
-import "temporal/api/failure/v1/message.proto";
-import "temporal/api/workflow/v1/message.proto";
-import "temporal/api/taskqueue/v1/message.proto";
+import "temporal/api/v1/enums_event_type.proto";
+import "temporal/api/v1/enums_failed_cause.proto";
+import "temporal/api/v1/enums_workflow.proto";
+import "temporal/api/v1/common_message.proto";
+import "temporal/api/v1/failure_message.proto";
+import "temporal/api/v1/workflow_message.proto";
+import "temporal/api/v1/taskqueue_message.proto";
 
 // Always the first event in workflow history
 message WorkflowExecutionStartedEventAttributes {
diff --git a/temporal/api/namespace/v1/message.proto b/temporal/api/v1/namespace_message.proto
similarity index 96%
rename from temporal/api/namespace/v1/message.proto
rename to temporal/api/v1/namespace_message.proto
index 1df585feb..6d802e324 100644
--- a/temporal/api/namespace/v1/message.proto
+++ b/temporal/api/v1/namespace_message.proto
@@ -29,14 +29,14 @@ option java_package = "io.temporal.api.namespace.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::Namespace::V1";
-option csharp_namespace = "Temporal.Api.Namespace.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 
 import "dependencies/gogoproto/gogo.proto";
 
-import "temporal/api/enums/v1/namespace.proto";
+import "temporal/api/v1/enums_namespace.proto";
 
 
 message NamespaceInfo {
diff --git a/temporal/api/operatorservice/v1/request_response.proto b/temporal/api/v1/operatorservice_request_response.proto
similarity index 96%
rename from temporal/api/operatorservice/v1/request_response.proto
rename to temporal/api/v1/operatorservice_request_response.proto
index 7fa551fb5..7e47d926f 100644
--- a/temporal/api/operatorservice/v1/request_response.proto
+++ b/temporal/api/v1/operatorservice_request_response.proto
@@ -29,9 +29,9 @@ option java_package = "io.temporal.api.operatorservice.v1";
 option java_multiple_files = true;
 option java_outer_classname = "RequestResponseProto";
 option ruby_package = "Temporal::Api::OperatorService::V1";
-option csharp_namespace = "Temporal.Api.OperatorService.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
-import "temporal/api/enums/v1/common.proto";
+import "temporal/api/v1/enums_common.proto";
 
 // (-- Search Attribute --)
 
diff --git a/temporal/api/operatorservice/v1/service.proto b/temporal/api/v1/operatorservice_service.proto
similarity index 96%
rename from temporal/api/operatorservice/v1/service.proto
rename to temporal/api/v1/operatorservice_service.proto
index cec40e027..c01854a5b 100644
--- a/temporal/api/operatorservice/v1/service.proto
+++ b/temporal/api/v1/operatorservice_service.proto
@@ -29,10 +29,10 @@ option java_package = "io.temporal.api.operatorservice.v1";
 option java_multiple_files = true;
 option java_outer_classname = "ServiceProto";
 option ruby_package = "Temporal::Api::OperatorService::V1";
-option csharp_namespace = "Temporal.Api.OperatorService.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.OperatorService";
 
 
-import "temporal/api/operatorservice/v1/request_response.proto";
+import "temporal/api/v1/operatorservice_request_response.proto";
 
 // OperatorService API defines how Temporal SDKs and other clients interact with the Temporal server
 // to perform administrative functions like registering a search attribute or a namespace.
diff --git a/temporal/api/query/v1/message.proto b/temporal/api/v1/query_message.proto
similarity index 92%
rename from temporal/api/query/v1/message.proto
rename to temporal/api/v1/query_message.proto
index 61f794230..62a6e0c15 100644
--- a/temporal/api/query/v1/message.proto
+++ b/temporal/api/v1/query_message.proto
@@ -29,11 +29,11 @@ option java_package = "io.temporal.api.query.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::Query::V1";
-option csharp_namespace = "Temporal.Api.Query.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
-import "temporal/api/enums/v1/query.proto";
-import "temporal/api/enums/v1/workflow.proto";
-import "temporal/api/common/v1/message.proto";
+import "temporal/api/v1/enums_query.proto";
+import "temporal/api/v1/enums_workflow.proto";
+import "temporal/api/v1/common_message.proto";
 
 // See https://docs.temporal.io/docs/concepts/queries/
 message WorkflowQuery {
diff --git a/temporal/api/replication/v1/message.proto b/temporal/api/v1/replication_message.proto
similarity index 94%
rename from temporal/api/replication/v1/message.proto
rename to temporal/api/v1/replication_message.proto
index ada92ed45..764558b71 100644
--- a/temporal/api/replication/v1/message.proto
+++ b/temporal/api/v1/replication_message.proto
@@ -29,9 +29,9 @@ option java_package = "io.temporal.api.replication.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::Replication::V1";
-option csharp_namespace = "Temporal.Api.Replication.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
-import "temporal/api/enums/v1/namespace.proto";
+import "temporal/api/v1/enums_namespace.proto";
 
 message ClusterReplicationConfig {
     string cluster_name = 1;
diff --git a/temporal/api/taskqueue/v1/message.proto b/temporal/api/v1/taskqueue_message.proto
similarity index 96%
rename from temporal/api/taskqueue/v1/message.proto
rename to temporal/api/v1/taskqueue_message.proto
index af25292e6..560458abf 100644
--- a/temporal/api/taskqueue/v1/message.proto
+++ b/temporal/api/v1/taskqueue_message.proto
@@ -29,7 +29,7 @@ option java_package = "io.temporal.api.taskqueue.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::TaskQueue::V1";
-option csharp_namespace = "Temporal.Api.TaskQueue.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
@@ -37,7 +37,7 @@ import "google/protobuf/wrappers.proto";
 
 import "dependencies/gogoproto/gogo.proto";
 
-import "temporal/api/enums/v1/task_queue.proto";
+import "temporal/api/v1/enums_task_queue.proto";
 
 // See https://docs.temporal.io/docs/concepts/task-queues/
 message TaskQueue {
diff --git a/temporal/api/version/v1/message.proto b/temporal/api/v1/version_message.proto
similarity index 95%
rename from temporal/api/version/v1/message.proto
rename to temporal/api/v1/version_message.proto
index a089713f4..7f2d33a31 100644
--- a/temporal/api/version/v1/message.proto
+++ b/temporal/api/v1/version_message.proto
@@ -29,11 +29,11 @@ option java_package = "io.temporal.api.version.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::Version::V1";
-option csharp_namespace = "Temporal.Api.Version.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 import "google/protobuf/timestamp.proto";
 import "dependencies/gogoproto/gogo.proto";
-import "temporal/api/enums/v1/common.proto";
+import "temporal/api/v1/enums_common.proto";
 
 // ReleaseInfo contains information about specific version of temporal.
 message ReleaseInfo {
diff --git a/temporal/api/workflow/v1/message.proto b/temporal/api/v1/workflow_message.proto
similarity index 95%
rename from temporal/api/workflow/v1/message.proto
rename to temporal/api/v1/workflow_message.proto
index 53d92fec0..aec7a08c1 100644
--- a/temporal/api/workflow/v1/message.proto
+++ b/temporal/api/v1/workflow_message.proto
@@ -29,17 +29,17 @@ option java_package = "io.temporal.api.workflow.v1";
 option java_multiple_files = true;
 option java_outer_classname = "MessageProto";
 option ruby_package = "Temporal::Api::Workflow::V1";
-option csharp_namespace = "Temporal.Api.Workflow.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 
 import "dependencies/gogoproto/gogo.proto";
 
-import "temporal/api/enums/v1/workflow.proto";
-import "temporal/api/common/v1/message.proto";
-import "temporal/api/failure/v1/message.proto";
-import "temporal/api/taskqueue/v1/message.proto";
+import "temporal/api/v1/enums_workflow.proto";
+import "temporal/api/v1/common_message.proto";
+import "temporal/api/v1/failure_message.proto";
+import "temporal/api/v1/taskqueue_message.proto";
 
 message WorkflowExecutionInfo {
     temporal.api.common.v1.WorkflowExecution execution = 1;
diff --git a/temporal/api/workflowservice/v1/request_response.proto b/temporal/api/v1/workflowservice_request_response.proto
similarity index 97%
rename from temporal/api/workflowservice/v1/request_response.proto
rename to temporal/api/v1/workflowservice_request_response.proto
index 1d550f1e6..5b5e5ebb6 100644
--- a/temporal/api/workflowservice/v1/request_response.proto
+++ b/temporal/api/v1/workflowservice_request_response.proto
@@ -29,26 +29,26 @@ option java_package = "io.temporal.api.workflowservice.v1";
 option java_multiple_files = true;
 option java_outer_classname = "RequestResponseProto";
 option ruby_package = "Temporal::Api::WorkflowService::V1";
-option csharp_namespace = "Temporal.Api.WorkflowService.V1";
-
-import "temporal/api/enums/v1/workflow.proto";
-import "temporal/api/enums/v1/namespace.proto";
-import "temporal/api/enums/v1/failed_cause.proto";
-import "temporal/api/enums/v1/common.proto";
-import "temporal/api/enums/v1/query.proto";
-import "temporal/api/enums/v1/reset.proto";
-import "temporal/api/enums/v1/task_queue.proto";
-import "temporal/api/common/v1/message.proto";
-import "temporal/api/history/v1/message.proto";
-import "temporal/api/workflow/v1/message.proto";
-import "temporal/api/command/v1/message.proto";
-import "temporal/api/failure/v1/message.proto";
-import "temporal/api/filter/v1/message.proto";
-import "temporal/api/namespace/v1/message.proto";
-import "temporal/api/query/v1/message.proto";
-import "temporal/api/replication/v1/message.proto";
-import "temporal/api/taskqueue/v1/message.proto";
-import "temporal/api/version/v1/message.proto";
+option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";
+
+import "temporal/api/v1/enums_workflow.proto";
+import "temporal/api/v1/enums_namespace.proto";
+import "temporal/api/v1/enums_failed_cause.proto";
+import "temporal/api/v1/enums_common.proto";
+import "temporal/api/v1/enums_query.proto";
+import "temporal/api/v1/enums_reset.proto";
+import "temporal/api/v1/enums_task_queue.proto";
+import "temporal/api/v1/common_message.proto";
+import "temporal/api/v1/history_message.proto";
+import "temporal/api/v1/workflow_message.proto";
+import "temporal/api/v1/command_message.proto";
+import "temporal/api/v1/failure_message.proto";
+import "temporal/api/v1/filter_message.proto";
+import "temporal/api/v1/namespace_message.proto";
+import "temporal/api/v1/query_message.proto";
+import "temporal/api/v1/replication_message.proto";
+import "temporal/api/v1/taskqueue_message.proto";
+import "temporal/api/v1/version_message.proto";
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
diff --git a/temporal/api/workflowservice/v1/service.proto b/temporal/api/v1/workflowservice_service.proto
similarity index 99%
rename from temporal/api/workflowservice/v1/service.proto
rename to temporal/api/v1/workflowservice_service.proto
index 9fe8f9372..11ab5956b 100644
--- a/temporal/api/workflowservice/v1/service.proto
+++ b/temporal/api/v1/workflowservice_service.proto
@@ -29,10 +29,10 @@ option java_package = "io.temporal.api.workflowservice.v1";
 option java_multiple_files = true;
 option java_outer_classname = "ServiceProto";
 option ruby_package = "Temporal::Api::WorkflowService::V1";
-option csharp_namespace = "Temporal.Api.WorkflowService.V1";
+option csharp_namespace = "Temporal.ServiceApi.V1.WorkflowService";
 
 
-import "temporal/api/workflowservice/v1/request_response.proto";
+import "temporal/api/v1/workflowservice_request_response.proto";
 
 // WorkflowService API defines how Temporal SDKs and other clients interact with the Temporal server
 // to create and interact with workflows and activities.