diff --git a/lib/bolt/config/src/service.rs b/lib/bolt/config/src/service.rs index 664752dae..57cdd72f0 100644 --- a/lib/bolt/config/src/service.rs +++ b/lib/bolt/config/src/service.rs @@ -96,8 +96,9 @@ pub enum ServiceKind { #[serde(rename = "operation")] Operation {}, - #[serde(rename = "operations")] - Operations {}, + /// A collection of operations and workflows/workers. + #[serde(rename = "package")] + Package {}, // TODO: Rename to worker #[serde(rename = "consumer")] @@ -341,7 +342,7 @@ impl ServiceKind { ServiceKind::Static { .. } => "static", ServiceKind::Database { .. } => "database", ServiceKind::Cache { .. } => "cache", - ServiceKind::Operations { .. } => "operations", + ServiceKind::Package { .. } => "package", } } @@ -354,7 +355,7 @@ impl ServiceKind { | ServiceKind::Api { .. } => ComponentClass::Executable, ServiceKind::Operation { .. } - | ServiceKind::Operations { .. } + | ServiceKind::Package { .. } | ServiceKind::Consumer { .. } | ServiceKind::ApiRoutes { .. } => ComponentClass::NonExecutable, ServiceKind::Database { .. } => ComponentClass::Database, diff --git a/lib/bolt/core/src/context/project.rs b/lib/bolt/core/src/context/project.rs index ef659c968..8d96bd268 100644 --- a/lib/bolt/core/src/context/project.rs +++ b/lib/bolt/core/src/context/project.rs @@ -392,51 +392,47 @@ impl ProjectContextData { let pkgs_path = workspace_path.join("pkg"); let mut pkg_dir = fs::read_dir(&pkgs_path).await.unwrap(); while let Some(pkg) = pkg_dir.next_entry().await.unwrap() { - // Read worker - let worker_path = pkg.path().join("worker"); - if fs::metadata(&worker_path.join("Service.toml")) - .await - .is_ok() - { - // Load the service + // Check if pkg-level service config exists + if fs::metadata(pkg.path().join("Service.toml")).await.is_ok() { + // Load the directory as a single crate let svc_ctx = context::service::ServiceContextData::from_path( Weak::new(), svc_ctxs_map, &workspace_path, - &worker_path, - ) - .await - .unwrap(); - svc_ctxs_map.insert(svc_ctx.name(), svc_ctx.clone()); - } - - // Read standalone - Self::load_services_dir(svc_ctxs_map, &workspace_path, pkg.path().join("standalone")) - .await; - - // Read ops - // Check if service config exists - if fs::metadata(pkg.path().join("ops").join("Service.toml")) - .await - .is_ok() - { - // Load the ops directory as a single service - let svc_ctx = context::service::ServiceContextData::from_path( - Weak::new(), - svc_ctxs_map, - &workspace_path, - &pkg.path().join("ops"), + &pkg.path(), ) .await .unwrap(); svc_ctxs_map.insert(svc_ctx.name(), svc_ctx.clone()); } else { + // Read worker + let worker_path = pkg.path().join("worker"); + if fs::metadata(&worker_path.join("Service.toml")) + .await + .is_ok() + { + // Load the service + let svc_ctx = context::service::ServiceContextData::from_path( + Weak::new(), + svc_ctxs_map, + &workspace_path, + &worker_path, + ) + .await + .unwrap(); + svc_ctxs_map.insert(svc_ctx.name(), svc_ctx.clone()); + } + // Load all individual ops Self::load_services_dir(svc_ctxs_map, &workspace_path, pkg.path().join("ops")) .await; } + // Read standalone + Self::load_services_dir(svc_ctxs_map, &workspace_path, pkg.path().join("standalone")) + .await; + // Read dbs Self::load_services_dir(svc_ctxs_map, &workspace_path, pkg.path().join("db")).await; diff --git a/lib/bolt/core/src/context/service.rs b/lib/bolt/core/src/context/service.rs index e2c1263bb..d1bf9b184 100644 --- a/lib/bolt/core/src/context/service.rs +++ b/lib/bolt/core/src/context/service.rs @@ -516,7 +516,7 @@ impl ServiceContextData { dep.config().kind, ServiceKind::Database { .. } | ServiceKind::Cache { .. } | ServiceKind::Operation { .. } - | ServiceKind::Operations { .. } + | ServiceKind::Package { .. } | ServiceKind::Consumer { .. } ) } else if matches!(self.config().kind, ServiceKind::Api { .. }) { @@ -524,7 +524,7 @@ impl ServiceContextData { dep.config().kind, ServiceKind::Database { .. } | ServiceKind::Cache { .. } | ServiceKind::Operation { .. } - | ServiceKind::Operations { .. } + | ServiceKind::Package { .. } | ServiceKind::ApiRoutes { .. } | ServiceKind::Consumer { .. } ) @@ -533,7 +533,7 @@ impl ServiceContextData { dep.config().kind, ServiceKind::Database { .. } | ServiceKind::Cache { .. } | ServiceKind::Operation { .. } - | ServiceKind::Operations { .. } + | ServiceKind::Package { .. } | ServiceKind::Consumer { .. } ) }; diff --git a/lib/bolt/core/src/dep/k8s/gen.rs b/lib/bolt/core/src/dep/k8s/gen.rs index 585b18a75..1e1cec101 100644 --- a/lib/bolt/core/src/dep/k8s/gen.rs +++ b/lib/bolt/core/src/dep/k8s/gen.rs @@ -136,7 +136,7 @@ pub async fn gen_svc(exec_ctx: &ExecServiceContext) -> Vec { ServiceKind::Oneshot { .. } => SpecType::Job, ServiceKind::Periodic { .. } => SpecType::CronJob, ServiceKind::Operation { .. } - | ServiceKind::Operations { .. } + | ServiceKind::Package { .. } | ServiceKind::Database { .. } | ServiceKind::Cache { .. } | ServiceKind::ApiRoutes { .. } => { diff --git a/lib/bolt/core/src/tasks/gen.rs b/lib/bolt/core/src/tasks/gen.rs index 90916b94a..0d6d276e4 100644 --- a/lib/bolt/core/src/tasks/gen.rs +++ b/lib/bolt/core/src/tasks/gen.rs @@ -94,21 +94,6 @@ async fn generate_root(path: &Path) { let _ = fs::remove_file(pkg.path().join("Cargo.lock")).await; let _ = fs::remove_file(pkg.path().join("ops").join("Cargo.lock")).await; - // Check worker - let worker_path = pkg.path().join("worker"); - if fs::metadata(&worker_path).await.is_ok() { - workspace_members.push(format!( - r#""pkg/{pkg}/worker""#, - pkg = pkg.file_name().into_string().unwrap(), - )); - - // Remove services' Cargo.lock files in favor of the shared svc - // Cargo.toml - let _ = fs::remove_file(worker_path.join("Cargo.lock")).await; - - set_license(&worker_path.join("Cargo.toml")).await; - } - // Iterate through `standalone` folder let standalone_path = pkg.path().join("standalone"); if fs::metadata(&standalone_path).await.is_ok() { @@ -131,21 +116,37 @@ async fn generate_root(path: &Path) { } // Check if service config exists - if fs::metadata(pkg.path().join("ops").join("Service.toml")) - .await - .is_ok() - { + if fs::metadata(pkg.path().join("Service.toml")).await.is_ok() { workspace_members.push(format!( - r#""pkg/{pkg}/ops""#, + r#""pkg/{pkg}""#, pkg = pkg.file_name().into_string().unwrap(), )); - let _ = fs::remove_file(pkg.path().join("ops").join("Cargo.lock")).await; + let _ = fs::remove_file(pkg.path().join("Cargo.lock")).await; - set_license(&pkg.path().join("ops").join("Cargo.toml")).await; - } - // Iterate through `ops` folder - else { + set_license(&pkg.path().join("Cargo.toml")).await; + + let types_path = pkg.path().join("types"); + if fs::metadata(&types_path).await.is_ok() { + set_license(&types_path.join("Cargo.toml")).await; + } + } else { + // Check worker + let worker_path = pkg.path().join("worker"); + if fs::metadata(&worker_path).await.is_ok() { + workspace_members.push(format!( + r#""pkg/{pkg}/worker""#, + pkg = pkg.file_name().into_string().unwrap(), + )); + + // Remove services' Cargo.lock files in favor of the shared svc + // Cargo.toml + let _ = fs::remove_file(worker_path.join("Cargo.lock")).await; + + set_license(&worker_path.join("Cargo.toml")).await; + } + + // Iterate through `ops` folder let ops_path = pkg.path().join("ops"); if fs::metadata(&ops_path).await.is_ok() { let mut dir = fs::read_dir(ops_path).await.unwrap(); @@ -166,6 +167,12 @@ async fn generate_root(path: &Path) { } } } + + // Utils lib + let util_path = pkg.path().join("util"); + if fs::metadata(&util_path).await.is_ok() { + set_license(&util_path.join("Cargo.toml")).await; + } } } diff --git a/lib/bolt/core/src/tasks/template.rs b/lib/bolt/core/src/tasks/template.rs index f456f88d6..db263af49 100644 --- a/lib/bolt/core/src/tasks/template.rs +++ b/lib/bolt/core/src/tasks/template.rs @@ -75,20 +75,22 @@ pub async fn generate(ctx: &mut ProjectContext, opts: TemplateOpts) -> Result<() ); } - // Check for new operations service type - if matches!(template_type, TemplateType::Operation) - && fs::metadata( - base_path - .join("svc") - .join("pkg") - .join(&pkg_name) - .join("Service.toml"), - ) - .await - .is_ok() + // Check for package service type + if matches!( + template_type, + TemplateType::Operation | TemplateType::Worker + ) && fs::metadata( + base_path + .join("svc") + .join("pkg") + .join(&pkg_name) + .join("Service.toml"), + ) + .await + .is_ok() { bail!( - "Creating operations in new `operations` service type ({pkg_name}/ops) not yet supported.", + "Creating operations or workers in the new refactored packages ({pkg_name}) is not yet supported.", ); } @@ -193,7 +195,7 @@ pub async fn generate(ctx: &mut ProjectContext, opts: TemplateOpts) -> Result<() .join("svc") .join("pkg") .join(pkg_name) - .join("types") + .join("proto") .join("msg"); let proto_file_path = proto_path.join(format!("{}.proto", service_name)); @@ -227,7 +229,7 @@ pub async fn generate(ctx: &mut ProjectContext, opts: TemplateOpts) -> Result<() base_path .join("svc") .join("templates") - .join("types") + .join("proto") .join("msg") .join("{{ name }}.proto"), proto_path, @@ -240,7 +242,7 @@ pub async fn generate(ctx: &mut ProjectContext, opts: TemplateOpts) -> Result<() .join("svc") .join("pkg") .join(pkg_name) - .join("types"); + .join("proto"); let proto_file_path = proto_path.join(format!("{}.proto", service_name)); if fs::metadata(&proto_file_path).await.is_ok() { bail!( @@ -260,7 +262,7 @@ pub async fn generate(ctx: &mut ProjectContext, opts: TemplateOpts) -> Result<() base_path .join("svc") .join("templates") - .join("types") + .join("proto") .join("{{ name }}.proto"), proto_path, ) diff --git a/lib/types/build/src/lib.rs b/lib/types/build/src/lib.rs index e1af14ed6..ccaec4b1f 100644 --- a/lib/types/build/src/lib.rs +++ b/lib/types/build/src/lib.rs @@ -40,7 +40,7 @@ where for project_root in &project_roots { for entry in fs::read_dir(project_root.join("svc").join("pkg"))? { let entry = entry?; - let proto_path = entry.path().join("types"); + let proto_path = entry.path().join("proto"); if proto_path.is_dir() { println!("cargo:rerun-if-changed={}", proto_path.display()); diff --git a/svc/pkg/analytics/types/msg/event-create.proto b/svc/pkg/analytics/proto/msg/event-create.proto similarity index 100% rename from svc/pkg/analytics/types/msg/event-create.proto rename to svc/pkg/analytics/proto/msg/event-create.proto diff --git a/svc/pkg/build/types/create.proto b/svc/pkg/build/proto/create.proto similarity index 100% rename from svc/pkg/build/types/create.proto rename to svc/pkg/build/proto/create.proto diff --git a/svc/pkg/build/types/get.proto b/svc/pkg/build/proto/get.proto similarity index 100% rename from svc/pkg/build/types/get.proto rename to svc/pkg/build/proto/get.proto diff --git a/svc/pkg/build/types/list-for-game.proto b/svc/pkg/build/proto/list-for-game.proto similarity index 100% rename from svc/pkg/build/types/list-for-game.proto rename to svc/pkg/build/proto/list-for-game.proto diff --git a/svc/pkg/captcha/types/hcaptcha-config-get.proto b/svc/pkg/captcha/proto/hcaptcha-config-get.proto similarity index 100% rename from svc/pkg/captcha/types/hcaptcha-config-get.proto rename to svc/pkg/captcha/proto/hcaptcha-config-get.proto diff --git a/svc/pkg/captcha/types/hcaptcha-verify.proto b/svc/pkg/captcha/proto/hcaptcha-verify.proto similarity index 100% rename from svc/pkg/captcha/types/hcaptcha-verify.proto rename to svc/pkg/captcha/proto/hcaptcha-verify.proto diff --git a/svc/pkg/captcha/types/request.proto b/svc/pkg/captcha/proto/request.proto similarity index 100% rename from svc/pkg/captcha/types/request.proto rename to svc/pkg/captcha/proto/request.proto diff --git a/svc/pkg/captcha/types/turnstile-config-get.proto b/svc/pkg/captcha/proto/turnstile-config-get.proto similarity index 100% rename from svc/pkg/captcha/types/turnstile-config-get.proto rename to svc/pkg/captcha/proto/turnstile-config-get.proto diff --git a/svc/pkg/captcha/types/turnstile-verify.proto b/svc/pkg/captcha/proto/turnstile-verify.proto similarity index 100% rename from svc/pkg/captcha/types/turnstile-verify.proto rename to svc/pkg/captcha/proto/turnstile-verify.proto diff --git a/svc/pkg/captcha/types/verify.proto b/svc/pkg/captcha/proto/verify.proto similarity index 100% rename from svc/pkg/captcha/types/verify.proto rename to svc/pkg/captcha/proto/verify.proto diff --git a/svc/pkg/cdn/types/msg/ns-config-update.proto b/svc/pkg/cdn/proto/msg/ns-config-update.proto similarity index 100% rename from svc/pkg/cdn/types/msg/ns-config-update.proto rename to svc/pkg/cdn/proto/msg/ns-config-update.proto diff --git a/svc/pkg/cdn/types/namespace-auth-user-remove.proto b/svc/pkg/cdn/proto/namespace-auth-user-remove.proto similarity index 100% rename from svc/pkg/cdn/types/namespace-auth-user-remove.proto rename to svc/pkg/cdn/proto/namespace-auth-user-remove.proto diff --git a/svc/pkg/cdn/types/namespace-auth-user-update.proto b/svc/pkg/cdn/proto/namespace-auth-user-update.proto similarity index 100% rename from svc/pkg/cdn/types/namespace-auth-user-update.proto rename to svc/pkg/cdn/proto/namespace-auth-user-update.proto diff --git a/svc/pkg/cdn/types/namespace-create.proto b/svc/pkg/cdn/proto/namespace-create.proto similarity index 100% rename from svc/pkg/cdn/types/namespace-create.proto rename to svc/pkg/cdn/proto/namespace-create.proto diff --git a/svc/pkg/cdn/types/namespace-domain-create.proto b/svc/pkg/cdn/proto/namespace-domain-create.proto similarity index 100% rename from svc/pkg/cdn/types/namespace-domain-create.proto rename to svc/pkg/cdn/proto/namespace-domain-create.proto diff --git a/svc/pkg/cdn/types/namespace-domain-remove.proto b/svc/pkg/cdn/proto/namespace-domain-remove.proto similarity index 100% rename from svc/pkg/cdn/types/namespace-domain-remove.proto rename to svc/pkg/cdn/proto/namespace-domain-remove.proto diff --git a/svc/pkg/cdn/types/namespace-get.proto b/svc/pkg/cdn/proto/namespace-get.proto similarity index 100% rename from svc/pkg/cdn/types/namespace-get.proto rename to svc/pkg/cdn/proto/namespace-get.proto diff --git a/svc/pkg/cdn/types/namespace-resolve-domain.proto b/svc/pkg/cdn/proto/namespace-resolve-domain.proto similarity index 100% rename from svc/pkg/cdn/types/namespace-resolve-domain.proto rename to svc/pkg/cdn/proto/namespace-resolve-domain.proto diff --git a/svc/pkg/cdn/types/ns-auth-type-set.proto b/svc/pkg/cdn/proto/ns-auth-type-set.proto similarity index 100% rename from svc/pkg/cdn/types/ns-auth-type-set.proto rename to svc/pkg/cdn/proto/ns-auth-type-set.proto diff --git a/svc/pkg/cdn/types/ns-enable-domain-public-auth-set.proto b/svc/pkg/cdn/proto/ns-enable-domain-public-auth-set.proto similarity index 100% rename from svc/pkg/cdn/types/ns-enable-domain-public-auth-set.proto rename to svc/pkg/cdn/proto/ns-enable-domain-public-auth-set.proto diff --git a/svc/pkg/cdn/types/redis-cdn.proto b/svc/pkg/cdn/proto/redis-cdn.proto similarity index 100% rename from svc/pkg/cdn/types/redis-cdn.proto rename to svc/pkg/cdn/proto/redis-cdn.proto diff --git a/svc/pkg/cdn/types/site-create.proto b/svc/pkg/cdn/proto/site-create.proto similarity index 100% rename from svc/pkg/cdn/types/site-create.proto rename to svc/pkg/cdn/proto/site-create.proto diff --git a/svc/pkg/cdn/types/site-get.proto b/svc/pkg/cdn/proto/site-get.proto similarity index 100% rename from svc/pkg/cdn/types/site-get.proto rename to svc/pkg/cdn/proto/site-get.proto diff --git a/svc/pkg/cdn/types/site-list-for-game.proto b/svc/pkg/cdn/proto/site-list-for-game.proto similarity index 100% rename from svc/pkg/cdn/types/site-list-for-game.proto rename to svc/pkg/cdn/proto/site-list-for-game.proto diff --git a/svc/pkg/cdn/types/version-get.proto b/svc/pkg/cdn/proto/version-get.proto similarity index 100% rename from svc/pkg/cdn/types/version-get.proto rename to svc/pkg/cdn/proto/version-get.proto diff --git a/svc/pkg/cdn/types/version-prepare.proto b/svc/pkg/cdn/proto/version-prepare.proto similarity index 100% rename from svc/pkg/cdn/types/version-prepare.proto rename to svc/pkg/cdn/proto/version-prepare.proto diff --git a/svc/pkg/cdn/types/version-publish.proto b/svc/pkg/cdn/proto/version-publish.proto similarity index 100% rename from svc/pkg/cdn/types/version-publish.proto rename to svc/pkg/cdn/proto/version-publish.proto diff --git a/svc/pkg/cf-custom-hostname/types/get.proto b/svc/pkg/cf-custom-hostname/proto/get.proto similarity index 100% rename from svc/pkg/cf-custom-hostname/types/get.proto rename to svc/pkg/cf-custom-hostname/proto/get.proto diff --git a/svc/pkg/cf-custom-hostname/types/list-for-namespace-id.proto b/svc/pkg/cf-custom-hostname/proto/list-for-namespace-id.proto similarity index 100% rename from svc/pkg/cf-custom-hostname/types/list-for-namespace-id.proto rename to svc/pkg/cf-custom-hostname/proto/list-for-namespace-id.proto diff --git a/svc/pkg/cf-custom-hostname/types/msg/create-complete.proto b/svc/pkg/cf-custom-hostname/proto/msg/create-complete.proto similarity index 100% rename from svc/pkg/cf-custom-hostname/types/msg/create-complete.proto rename to svc/pkg/cf-custom-hostname/proto/msg/create-complete.proto diff --git a/svc/pkg/cf-custom-hostname/types/msg/create-fail.proto b/svc/pkg/cf-custom-hostname/proto/msg/create-fail.proto similarity index 100% rename from svc/pkg/cf-custom-hostname/types/msg/create-fail.proto rename to svc/pkg/cf-custom-hostname/proto/msg/create-fail.proto diff --git a/svc/pkg/cf-custom-hostname/types/msg/create.proto b/svc/pkg/cf-custom-hostname/proto/msg/create.proto similarity index 100% rename from svc/pkg/cf-custom-hostname/types/msg/create.proto rename to svc/pkg/cf-custom-hostname/proto/msg/create.proto diff --git a/svc/pkg/cf-custom-hostname/types/msg/delete-complete.proto b/svc/pkg/cf-custom-hostname/proto/msg/delete-complete.proto similarity index 100% rename from svc/pkg/cf-custom-hostname/types/msg/delete-complete.proto rename to svc/pkg/cf-custom-hostname/proto/msg/delete-complete.proto diff --git a/svc/pkg/cf-custom-hostname/types/msg/delete.proto b/svc/pkg/cf-custom-hostname/proto/msg/delete.proto similarity index 100% rename from svc/pkg/cf-custom-hostname/types/msg/delete.proto rename to svc/pkg/cf-custom-hostname/proto/msg/delete.proto diff --git a/svc/pkg/cf-custom-hostname/types/msg/status-set.proto b/svc/pkg/cf-custom-hostname/proto/msg/status-set.proto similarity index 100% rename from svc/pkg/cf-custom-hostname/types/msg/status-set.proto rename to svc/pkg/cf-custom-hostname/proto/msg/status-set.proto diff --git a/svc/pkg/cf-custom-hostname/types/resolve-hostname.proto b/svc/pkg/cf-custom-hostname/proto/resolve-hostname.proto similarity index 100% rename from svc/pkg/cf-custom-hostname/types/resolve-hostname.proto rename to svc/pkg/cf-custom-hostname/proto/resolve-hostname.proto diff --git a/svc/pkg/cloud/types/device-link-create.proto b/svc/pkg/cloud/proto/device-link-create.proto similarity index 100% rename from svc/pkg/cloud/types/device-link-create.proto rename to svc/pkg/cloud/proto/device-link-create.proto diff --git a/svc/pkg/cloud/types/game-config-create.proto b/svc/pkg/cloud/proto/game-config-create.proto similarity index 100% rename from svc/pkg/cloud/types/game-config-create.proto rename to svc/pkg/cloud/proto/game-config-create.proto diff --git a/svc/pkg/cloud/types/game-config-get.proto b/svc/pkg/cloud/proto/game-config-get.proto similarity index 100% rename from svc/pkg/cloud/types/game-config-get.proto rename to svc/pkg/cloud/proto/game-config-get.proto diff --git a/svc/pkg/cloud/types/game-token-create.proto b/svc/pkg/cloud/proto/game-token-create.proto similarity index 100% rename from svc/pkg/cloud/types/game-token-create.proto rename to svc/pkg/cloud/proto/game-token-create.proto diff --git a/svc/pkg/cloud/types/msg/device-link-complete-complete.proto b/svc/pkg/cloud/proto/msg/device-link-complete-complete.proto similarity index 100% rename from svc/pkg/cloud/types/msg/device-link-complete-complete.proto rename to svc/pkg/cloud/proto/msg/device-link-complete-complete.proto diff --git a/svc/pkg/cloud/types/msg/device-link-complete.proto b/svc/pkg/cloud/proto/msg/device-link-complete.proto similarity index 100% rename from svc/pkg/cloud/types/msg/device-link-complete.proto rename to svc/pkg/cloud/proto/msg/device-link-complete.proto diff --git a/svc/pkg/cloud/types/msg/version-name-reserve-complete.proto b/svc/pkg/cloud/proto/msg/version-name-reserve-complete.proto similarity index 100% rename from svc/pkg/cloud/types/msg/version-name-reserve-complete.proto rename to svc/pkg/cloud/proto/msg/version-name-reserve-complete.proto diff --git a/svc/pkg/cloud/types/msg/version-name-reserve.proto b/svc/pkg/cloud/proto/msg/version-name-reserve.proto similarity index 100% rename from svc/pkg/cloud/types/msg/version-name-reserve.proto rename to svc/pkg/cloud/proto/msg/version-name-reserve.proto diff --git a/svc/pkg/cloud/types/namespace-create.proto b/svc/pkg/cloud/proto/namespace-create.proto similarity index 100% rename from svc/pkg/cloud/types/namespace-create.proto rename to svc/pkg/cloud/proto/namespace-create.proto diff --git a/svc/pkg/cloud/types/namespace-get.proto b/svc/pkg/cloud/proto/namespace-get.proto similarity index 100% rename from svc/pkg/cloud/types/namespace-get.proto rename to svc/pkg/cloud/proto/namespace-get.proto diff --git a/svc/pkg/cloud/types/namespace-token-development-create.proto b/svc/pkg/cloud/proto/namespace-token-development-create.proto similarity index 100% rename from svc/pkg/cloud/types/namespace-token-development-create.proto rename to svc/pkg/cloud/proto/namespace-token-development-create.proto diff --git a/svc/pkg/cloud/types/namespace-token-public-create.proto b/svc/pkg/cloud/proto/namespace-token-public-create.proto similarity index 100% rename from svc/pkg/cloud/types/namespace-token-public-create.proto rename to svc/pkg/cloud/proto/namespace-token-public-create.proto diff --git a/svc/pkg/cloud/types/version-get.proto b/svc/pkg/cloud/proto/version-get.proto similarity index 100% rename from svc/pkg/cloud/types/version-get.proto rename to svc/pkg/cloud/proto/version-get.proto diff --git a/svc/pkg/cloud/types/version-publish.proto b/svc/pkg/cloud/proto/version-publish.proto similarity index 100% rename from svc/pkg/cloud/types/version-publish.proto rename to svc/pkg/cloud/proto/version-publish.proto diff --git a/svc/pkg/cluster/types/datacenter-get.proto b/svc/pkg/cluster/proto/datacenter-get.proto similarity index 100% rename from svc/pkg/cluster/types/datacenter-get.proto rename to svc/pkg/cluster/proto/datacenter-get.proto diff --git a/svc/pkg/cluster/types/datacenter-list.proto b/svc/pkg/cluster/proto/datacenter-list.proto similarity index 100% rename from svc/pkg/cluster/types/datacenter-list.proto rename to svc/pkg/cluster/proto/datacenter-list.proto diff --git a/svc/pkg/cluster/types/datacenter-location-get.proto b/svc/pkg/cluster/proto/datacenter-location-get.proto similarity index 100% rename from svc/pkg/cluster/types/datacenter-location-get.proto rename to svc/pkg/cluster/proto/datacenter-location-get.proto diff --git a/svc/pkg/cluster/types/datacenter-resolve-for-name-id.proto b/svc/pkg/cluster/proto/datacenter-resolve-for-name-id.proto similarity index 100% rename from svc/pkg/cluster/types/datacenter-resolve-for-name-id.proto rename to svc/pkg/cluster/proto/datacenter-resolve-for-name-id.proto diff --git a/svc/pkg/cluster/types/datacenter-tls-get.proto b/svc/pkg/cluster/proto/datacenter-tls-get.proto similarity index 100% rename from svc/pkg/cluster/types/datacenter-tls-get.proto rename to svc/pkg/cluster/proto/datacenter-tls-get.proto diff --git a/svc/pkg/cluster/types/datacenter-topology-get.proto b/svc/pkg/cluster/proto/datacenter-topology-get.proto similarity index 100% rename from svc/pkg/cluster/types/datacenter-topology-get.proto rename to svc/pkg/cluster/proto/datacenter-topology-get.proto diff --git a/svc/pkg/cluster/types/get-for-game.proto b/svc/pkg/cluster/proto/get-for-game.proto similarity index 100% rename from svc/pkg/cluster/types/get-for-game.proto rename to svc/pkg/cluster/proto/get-for-game.proto diff --git a/svc/pkg/cluster/types/get.proto b/svc/pkg/cluster/proto/get.proto similarity index 100% rename from svc/pkg/cluster/types/get.proto rename to svc/pkg/cluster/proto/get.proto diff --git a/svc/pkg/cluster/types/list.proto b/svc/pkg/cluster/proto/list.proto similarity index 100% rename from svc/pkg/cluster/types/list.proto rename to svc/pkg/cluster/proto/list.proto diff --git a/svc/pkg/cluster/types/msg/create-complete.proto b/svc/pkg/cluster/proto/msg/create-complete.proto similarity index 100% rename from svc/pkg/cluster/types/msg/create-complete.proto rename to svc/pkg/cluster/proto/msg/create-complete.proto diff --git a/svc/pkg/cluster/types/msg/create.proto b/svc/pkg/cluster/proto/msg/create.proto similarity index 100% rename from svc/pkg/cluster/types/msg/create.proto rename to svc/pkg/cluster/proto/msg/create.proto diff --git a/svc/pkg/cluster/types/msg/datacenter-create.proto b/svc/pkg/cluster/proto/msg/datacenter-create.proto similarity index 100% rename from svc/pkg/cluster/types/msg/datacenter-create.proto rename to svc/pkg/cluster/proto/msg/datacenter-create.proto diff --git a/svc/pkg/cluster/types/msg/datacenter-scale.proto b/svc/pkg/cluster/proto/msg/datacenter-scale.proto similarity index 100% rename from svc/pkg/cluster/types/msg/datacenter-scale.proto rename to svc/pkg/cluster/proto/msg/datacenter-scale.proto diff --git a/svc/pkg/cluster/types/msg/datacenter-tls-issue.proto b/svc/pkg/cluster/proto/msg/datacenter-tls-issue.proto similarity index 100% rename from svc/pkg/cluster/types/msg/datacenter-tls-issue.proto rename to svc/pkg/cluster/proto/msg/datacenter-tls-issue.proto diff --git a/svc/pkg/cluster/types/msg/datacenter-update.proto b/svc/pkg/cluster/proto/msg/datacenter-update.proto similarity index 100% rename from svc/pkg/cluster/types/msg/datacenter-update.proto rename to svc/pkg/cluster/proto/msg/datacenter-update.proto diff --git a/svc/pkg/cluster/types/msg/game-link-complete.proto b/svc/pkg/cluster/proto/msg/game-link-complete.proto similarity index 100% rename from svc/pkg/cluster/types/msg/game-link-complete.proto rename to svc/pkg/cluster/proto/msg/game-link-complete.proto diff --git a/svc/pkg/cluster/types/msg/game-link.proto b/svc/pkg/cluster/proto/msg/game-link.proto similarity index 100% rename from svc/pkg/cluster/types/msg/game-link.proto rename to svc/pkg/cluster/proto/msg/game-link.proto diff --git a/svc/pkg/cluster/types/msg/server-destroy-complete.proto b/svc/pkg/cluster/proto/msg/server-destroy-complete.proto similarity index 100% rename from svc/pkg/cluster/types/msg/server-destroy-complete.proto rename to svc/pkg/cluster/proto/msg/server-destroy-complete.proto diff --git a/svc/pkg/cluster/types/msg/server-destroy.proto b/svc/pkg/cluster/proto/msg/server-destroy.proto similarity index 100% rename from svc/pkg/cluster/types/msg/server-destroy.proto rename to svc/pkg/cluster/proto/msg/server-destroy.proto diff --git a/svc/pkg/cluster/types/msg/server-dns-create.proto b/svc/pkg/cluster/proto/msg/server-dns-create.proto similarity index 100% rename from svc/pkg/cluster/types/msg/server-dns-create.proto rename to svc/pkg/cluster/proto/msg/server-dns-create.proto diff --git a/svc/pkg/cluster/types/msg/server-dns-delete.proto b/svc/pkg/cluster/proto/msg/server-dns-delete.proto similarity index 100% rename from svc/pkg/cluster/types/msg/server-dns-delete.proto rename to svc/pkg/cluster/proto/msg/server-dns-delete.proto diff --git a/svc/pkg/cluster/types/msg/server-drain.proto b/svc/pkg/cluster/proto/msg/server-drain.proto similarity index 100% rename from svc/pkg/cluster/types/msg/server-drain.proto rename to svc/pkg/cluster/proto/msg/server-drain.proto diff --git a/svc/pkg/cluster/types/msg/server-install-complete.proto b/svc/pkg/cluster/proto/msg/server-install-complete.proto similarity index 100% rename from svc/pkg/cluster/types/msg/server-install-complete.proto rename to svc/pkg/cluster/proto/msg/server-install-complete.proto diff --git a/svc/pkg/cluster/types/msg/server-install.proto b/svc/pkg/cluster/proto/msg/server-install.proto similarity index 100% rename from svc/pkg/cluster/types/msg/server-install.proto rename to svc/pkg/cluster/proto/msg/server-install.proto diff --git a/svc/pkg/cluster/types/msg/server-provision.proto b/svc/pkg/cluster/proto/msg/server-provision.proto similarity index 100% rename from svc/pkg/cluster/types/msg/server-provision.proto rename to svc/pkg/cluster/proto/msg/server-provision.proto diff --git a/svc/pkg/cluster/types/msg/server-taint.proto b/svc/pkg/cluster/proto/msg/server-taint.proto similarity index 100% rename from svc/pkg/cluster/types/msg/server-taint.proto rename to svc/pkg/cluster/proto/msg/server-taint.proto diff --git a/svc/pkg/cluster/types/msg/server-undrain.proto b/svc/pkg/cluster/proto/msg/server-undrain.proto similarity index 100% rename from svc/pkg/cluster/types/msg/server-undrain.proto rename to svc/pkg/cluster/proto/msg/server-undrain.proto diff --git a/svc/pkg/cluster/types/resolve-for-name-id.proto b/svc/pkg/cluster/proto/resolve-for-name-id.proto similarity index 100% rename from svc/pkg/cluster/types/resolve-for-name-id.proto rename to svc/pkg/cluster/proto/resolve-for-name-id.proto diff --git a/svc/pkg/cluster/types/server-destroy-with-filter.proto b/svc/pkg/cluster/proto/server-destroy-with-filter.proto similarity index 100% rename from svc/pkg/cluster/types/server-destroy-with-filter.proto rename to svc/pkg/cluster/proto/server-destroy-with-filter.proto diff --git a/svc/pkg/cluster/types/server-get.proto b/svc/pkg/cluster/proto/server-get.proto similarity index 100% rename from svc/pkg/cluster/types/server-get.proto rename to svc/pkg/cluster/proto/server-get.proto diff --git a/svc/pkg/cluster/types/server-list.proto b/svc/pkg/cluster/proto/server-list.proto similarity index 100% rename from svc/pkg/cluster/types/server-list.proto rename to svc/pkg/cluster/proto/server-list.proto diff --git a/svc/pkg/cluster/types/server-resolve-for-ip.proto b/svc/pkg/cluster/proto/server-resolve-for-ip.proto similarity index 100% rename from svc/pkg/cluster/types/server-resolve-for-ip.proto rename to svc/pkg/cluster/proto/server-resolve-for-ip.proto diff --git a/svc/pkg/custom-user-avatar/types/list-for-game.proto b/svc/pkg/custom-user-avatar/proto/list-for-game.proto similarity index 100% rename from svc/pkg/custom-user-avatar/types/list-for-game.proto rename to svc/pkg/custom-user-avatar/proto/list-for-game.proto diff --git a/svc/pkg/custom-user-avatar/types/upload-complete.proto b/svc/pkg/custom-user-avatar/proto/upload-complete.proto similarity index 100% rename from svc/pkg/custom-user-avatar/types/upload-complete.proto rename to svc/pkg/custom-user-avatar/proto/upload-complete.proto diff --git a/svc/pkg/debug/types/email-res.proto b/svc/pkg/debug/proto/email-res.proto similarity index 100% rename from svc/pkg/debug/types/email-res.proto rename to svc/pkg/debug/proto/email-res.proto diff --git a/svc/pkg/email-verification/types/complete.proto b/svc/pkg/email-verification/proto/complete.proto similarity index 100% rename from svc/pkg/email-verification/types/complete.proto rename to svc/pkg/email-verification/proto/complete.proto diff --git a/svc/pkg/email-verification/types/create.proto b/svc/pkg/email-verification/proto/create.proto similarity index 100% rename from svc/pkg/email-verification/types/create.proto rename to svc/pkg/email-verification/proto/create.proto diff --git a/svc/pkg/email/types/send.proto b/svc/pkg/email/proto/send.proto similarity index 100% rename from svc/pkg/email/types/send.proto rename to svc/pkg/email/proto/send.proto diff --git a/svc/pkg/external/types/msg/request-call-complete.proto b/svc/pkg/external/proto/msg/request-call-complete.proto similarity index 100% rename from svc/pkg/external/types/msg/request-call-complete.proto rename to svc/pkg/external/proto/msg/request-call-complete.proto diff --git a/svc/pkg/external/types/msg/request-call-fail.proto b/svc/pkg/external/proto/msg/request-call-fail.proto similarity index 100% rename from svc/pkg/external/types/msg/request-call-fail.proto rename to svc/pkg/external/proto/msg/request-call-fail.proto diff --git a/svc/pkg/external/types/msg/request-call.proto b/svc/pkg/external/proto/msg/request-call.proto similarity index 100% rename from svc/pkg/external/types/msg/request-call.proto rename to svc/pkg/external/proto/msg/request-call.proto diff --git a/svc/pkg/external/types/request-validate.proto b/svc/pkg/external/proto/request-validate.proto similarity index 100% rename from svc/pkg/external/types/request-validate.proto rename to svc/pkg/external/proto/request-validate.proto diff --git a/svc/pkg/faker/types/build.proto b/svc/pkg/faker/proto/build.proto similarity index 100% rename from svc/pkg/faker/types/build.proto rename to svc/pkg/faker/proto/build.proto diff --git a/svc/pkg/faker/types/cdn-site.proto b/svc/pkg/faker/proto/cdn-site.proto similarity index 100% rename from svc/pkg/faker/types/cdn-site.proto rename to svc/pkg/faker/proto/cdn-site.proto diff --git a/svc/pkg/faker/types/game-namespace.proto b/svc/pkg/faker/proto/game-namespace.proto similarity index 100% rename from svc/pkg/faker/types/game-namespace.proto rename to svc/pkg/faker/proto/game-namespace.proto diff --git a/svc/pkg/faker/types/game-version.proto b/svc/pkg/faker/proto/game-version.proto similarity index 100% rename from svc/pkg/faker/types/game-version.proto rename to svc/pkg/faker/proto/game-version.proto diff --git a/svc/pkg/faker/types/game.proto b/svc/pkg/faker/proto/game.proto similarity index 100% rename from svc/pkg/faker/types/game.proto rename to svc/pkg/faker/proto/game.proto diff --git a/svc/pkg/faker/types/job-run.proto b/svc/pkg/faker/proto/job-run.proto similarity index 100% rename from svc/pkg/faker/types/job-run.proto rename to svc/pkg/faker/proto/job-run.proto diff --git a/svc/pkg/faker/types/job-template.proto b/svc/pkg/faker/proto/job-template.proto similarity index 100% rename from svc/pkg/faker/types/job-template.proto rename to svc/pkg/faker/proto/job-template.proto diff --git a/svc/pkg/faker/types/mm-lobby-row.proto b/svc/pkg/faker/proto/mm-lobby-row.proto similarity index 100% rename from svc/pkg/faker/types/mm-lobby-row.proto rename to svc/pkg/faker/proto/mm-lobby-row.proto diff --git a/svc/pkg/faker/types/mm-lobby.proto b/svc/pkg/faker/proto/mm-lobby.proto similarity index 100% rename from svc/pkg/faker/types/mm-lobby.proto rename to svc/pkg/faker/proto/mm-lobby.proto diff --git a/svc/pkg/faker/types/mm-player.proto b/svc/pkg/faker/proto/mm-player.proto similarity index 100% rename from svc/pkg/faker/types/mm-player.proto rename to svc/pkg/faker/proto/mm-player.proto diff --git a/svc/pkg/faker/types/region.proto b/svc/pkg/faker/proto/region.proto similarity index 100% rename from svc/pkg/faker/types/region.proto rename to svc/pkg/faker/proto/region.proto diff --git a/svc/pkg/faker/types/team.proto b/svc/pkg/faker/proto/team.proto similarity index 100% rename from svc/pkg/faker/types/team.proto rename to svc/pkg/faker/proto/team.proto diff --git a/svc/pkg/faker/types/user.proto b/svc/pkg/faker/proto/user.proto similarity index 100% rename from svc/pkg/faker/types/user.proto rename to svc/pkg/faker/proto/user.proto diff --git a/svc/pkg/foo/worker/src/lib.rs b/svc/pkg/foo/worker/src/lib.rs index 70a876322..a7d563adc 100644 --- a/svc/pkg/foo/worker/src/lib.rs +++ b/svc/pkg/foo/worker/src/lib.rs @@ -3,8 +3,10 @@ use chirp_workflow::prelude::*; pub mod workflows; pub fn registry() -> Registry { + use workflows::*; + let mut registry = Registry::new(); - registry.register_workflow::(); + registry.register_workflow::(); registry } diff --git a/svc/pkg/foo/worker/src/workflows/test.rs b/svc/pkg/foo/worker/src/workflows/test.rs index 371eb5d76..0d7646ea1 100644 --- a/svc/pkg/foo/worker/src/workflows/test.rs +++ b/svc/pkg/foo/worker/src/workflows/test.rs @@ -1,5 +1,4 @@ use chirp_workflow::prelude::*; -use serde_json::json; #[derive(Debug, Serialize, Deserialize)] pub struct TestInput { diff --git a/svc/pkg/game-user/types/create.proto b/svc/pkg/game-user/proto/create.proto similarity index 100% rename from svc/pkg/game-user/types/create.proto rename to svc/pkg/game-user/proto/create.proto diff --git a/svc/pkg/game-user/types/get.proto b/svc/pkg/game-user/proto/get.proto similarity index 100% rename from svc/pkg/game-user/types/get.proto rename to svc/pkg/game-user/proto/get.proto diff --git a/svc/pkg/game-user/types/link-create.proto b/svc/pkg/game-user/proto/link-create.proto similarity index 100% rename from svc/pkg/game-user/types/link-create.proto rename to svc/pkg/game-user/proto/link-create.proto diff --git a/svc/pkg/game-user/types/link-get.proto b/svc/pkg/game-user/proto/link-get.proto similarity index 100% rename from svc/pkg/game-user/types/link-get.proto rename to svc/pkg/game-user/proto/link-get.proto diff --git a/svc/pkg/game-user/types/list-for-user.proto b/svc/pkg/game-user/proto/list-for-user.proto similarity index 100% rename from svc/pkg/game-user/types/list-for-user.proto rename to svc/pkg/game-user/proto/list-for-user.proto diff --git a/svc/pkg/game-user/types/msg/link-complete-complete.proto b/svc/pkg/game-user/proto/msg/link-complete-complete.proto similarity index 100% rename from svc/pkg/game-user/types/msg/link-complete-complete.proto rename to svc/pkg/game-user/proto/msg/link-complete-complete.proto diff --git a/svc/pkg/game-user/types/msg/link-complete-fail.proto b/svc/pkg/game-user/proto/msg/link-complete-fail.proto similarity index 100% rename from svc/pkg/game-user/types/msg/link-complete-fail.proto rename to svc/pkg/game-user/proto/msg/link-complete-fail.proto diff --git a/svc/pkg/game-user/types/msg/link-complete.proto b/svc/pkg/game-user/proto/msg/link-complete.proto similarity index 100% rename from svc/pkg/game-user/types/msg/link-complete.proto rename to svc/pkg/game-user/proto/msg/link-complete.proto diff --git a/svc/pkg/game-user/types/msg/session-create.proto b/svc/pkg/game-user/proto/msg/session-create.proto similarity index 100% rename from svc/pkg/game-user/types/msg/session-create.proto rename to svc/pkg/game-user/proto/msg/session-create.proto diff --git a/svc/pkg/game-user/types/msg/switch.proto b/svc/pkg/game-user/proto/msg/switch.proto similarity index 100% rename from svc/pkg/game-user/types/msg/switch.proto rename to svc/pkg/game-user/proto/msg/switch.proto diff --git a/svc/pkg/game-user/types/recent-session-list.proto b/svc/pkg/game-user/proto/recent-session-list.proto similarity index 100% rename from svc/pkg/game-user/types/recent-session-list.proto rename to svc/pkg/game-user/proto/recent-session-list.proto diff --git a/svc/pkg/game-user/types/recommend.proto b/svc/pkg/game-user/proto/recommend.proto similarity index 100% rename from svc/pkg/game-user/types/recommend.proto rename to svc/pkg/game-user/proto/recommend.proto diff --git a/svc/pkg/game-user/types/session-create.proto b/svc/pkg/game-user/proto/session-create.proto similarity index 100% rename from svc/pkg/game-user/types/session-create.proto rename to svc/pkg/game-user/proto/session-create.proto diff --git a/svc/pkg/game/types/banner-upload-complete.proto b/svc/pkg/game/proto/banner-upload-complete.proto similarity index 100% rename from svc/pkg/game/types/banner-upload-complete.proto rename to svc/pkg/game/proto/banner-upload-complete.proto diff --git a/svc/pkg/game/types/create.proto b/svc/pkg/game/proto/create.proto similarity index 100% rename from svc/pkg/game/types/create.proto rename to svc/pkg/game/proto/create.proto diff --git a/svc/pkg/game/types/get.proto b/svc/pkg/game/proto/get.proto similarity index 100% rename from svc/pkg/game/types/get.proto rename to svc/pkg/game/proto/get.proto diff --git a/svc/pkg/game/types/list-all.proto b/svc/pkg/game/proto/list-all.proto similarity index 100% rename from svc/pkg/game/types/list-all.proto rename to svc/pkg/game/proto/list-all.proto diff --git a/svc/pkg/game/types/list-for-team.proto b/svc/pkg/game/proto/list-for-team.proto similarity index 100% rename from svc/pkg/game/types/list-for-team.proto rename to svc/pkg/game/proto/list-for-team.proto diff --git a/svc/pkg/game/types/logo-upload-complete.proto b/svc/pkg/game/proto/logo-upload-complete.proto similarity index 100% rename from svc/pkg/game/types/logo-upload-complete.proto rename to svc/pkg/game/proto/logo-upload-complete.proto diff --git a/svc/pkg/game/types/msg/create-complete.proto b/svc/pkg/game/proto/msg/create-complete.proto similarity index 100% rename from svc/pkg/game/types/msg/create-complete.proto rename to svc/pkg/game/proto/msg/create-complete.proto diff --git a/svc/pkg/game/types/msg/ns-version-set-complete.proto b/svc/pkg/game/proto/msg/ns-version-set-complete.proto similarity index 100% rename from svc/pkg/game/types/msg/ns-version-set-complete.proto rename to svc/pkg/game/proto/msg/ns-version-set-complete.proto diff --git a/svc/pkg/game/types/msg/update.proto b/svc/pkg/game/proto/msg/update.proto similarity index 100% rename from svc/pkg/game/types/msg/update.proto rename to svc/pkg/game/proto/msg/update.proto diff --git a/svc/pkg/game/types/namespace-create.proto b/svc/pkg/game/proto/namespace-create.proto similarity index 100% rename from svc/pkg/game/types/namespace-create.proto rename to svc/pkg/game/proto/namespace-create.proto diff --git a/svc/pkg/game/types/namespace-get.proto b/svc/pkg/game/proto/namespace-get.proto similarity index 100% rename from svc/pkg/game/types/namespace-get.proto rename to svc/pkg/game/proto/namespace-get.proto diff --git a/svc/pkg/game/types/namespace-list.proto b/svc/pkg/game/proto/namespace-list.proto similarity index 100% rename from svc/pkg/game/types/namespace-list.proto rename to svc/pkg/game/proto/namespace-list.proto diff --git a/svc/pkg/game/types/namespace-resolve-name-id.proto b/svc/pkg/game/proto/namespace-resolve-name-id.proto similarity index 100% rename from svc/pkg/game/types/namespace-resolve-name-id.proto rename to svc/pkg/game/proto/namespace-resolve-name-id.proto diff --git a/svc/pkg/game/types/namespace-resolve-url.proto b/svc/pkg/game/proto/namespace-resolve-url.proto similarity index 100% rename from svc/pkg/game/types/namespace-resolve-url.proto rename to svc/pkg/game/proto/namespace-resolve-url.proto diff --git a/svc/pkg/game/types/namespace-validate.proto b/svc/pkg/game/proto/namespace-validate.proto similarity index 100% rename from svc/pkg/game/types/namespace-validate.proto rename to svc/pkg/game/proto/namespace-validate.proto diff --git a/svc/pkg/game/types/namespace-version-history-list.proto b/svc/pkg/game/proto/namespace-version-history-list.proto similarity index 100% rename from svc/pkg/game/types/namespace-version-history-list.proto rename to svc/pkg/game/proto/namespace-version-history-list.proto diff --git a/svc/pkg/game/types/namespace-version-set.proto b/svc/pkg/game/proto/namespace-version-set.proto similarity index 100% rename from svc/pkg/game/types/namespace-version-set.proto rename to svc/pkg/game/proto/namespace-version-set.proto diff --git a/svc/pkg/game/types/recommend.proto b/svc/pkg/game/proto/recommend.proto similarity index 100% rename from svc/pkg/game/types/recommend.proto rename to svc/pkg/game/proto/recommend.proto diff --git a/svc/pkg/game/types/resolve-name-id.proto b/svc/pkg/game/proto/resolve-name-id.proto similarity index 100% rename from svc/pkg/game/types/resolve-name-id.proto rename to svc/pkg/game/proto/resolve-name-id.proto diff --git a/svc/pkg/game/types/resolve-namespace-id.proto b/svc/pkg/game/proto/resolve-namespace-id.proto similarity index 100% rename from svc/pkg/game/types/resolve-namespace-id.proto rename to svc/pkg/game/proto/resolve-namespace-id.proto diff --git a/svc/pkg/game/types/token-development-validate.proto b/svc/pkg/game/proto/token-development-validate.proto similarity index 100% rename from svc/pkg/game/types/token-development-validate.proto rename to svc/pkg/game/proto/token-development-validate.proto diff --git a/svc/pkg/game/types/validate.proto b/svc/pkg/game/proto/validate.proto similarity index 100% rename from svc/pkg/game/types/validate.proto rename to svc/pkg/game/proto/validate.proto diff --git a/svc/pkg/game/types/version-create.proto b/svc/pkg/game/proto/version-create.proto similarity index 100% rename from svc/pkg/game/types/version-create.proto rename to svc/pkg/game/proto/version-create.proto diff --git a/svc/pkg/game/types/version-get.proto b/svc/pkg/game/proto/version-get.proto similarity index 100% rename from svc/pkg/game/types/version-get.proto rename to svc/pkg/game/proto/version-get.proto diff --git a/svc/pkg/game/types/version-list.proto b/svc/pkg/game/proto/version-list.proto similarity index 100% rename from svc/pkg/game/types/version-list.proto rename to svc/pkg/game/proto/version-list.proto diff --git a/svc/pkg/game/types/version-validate.proto b/svc/pkg/game/proto/version-validate.proto similarity index 100% rename from svc/pkg/game/types/version-validate.proto rename to svc/pkg/game/proto/version-validate.proto diff --git a/svc/pkg/identity-config/types/namespace-create.proto b/svc/pkg/identity-config/proto/namespace-create.proto similarity index 100% rename from svc/pkg/identity-config/types/namespace-create.proto rename to svc/pkg/identity-config/proto/namespace-create.proto diff --git a/svc/pkg/identity-config/types/namespace-get.proto b/svc/pkg/identity-config/proto/namespace-get.proto similarity index 100% rename from svc/pkg/identity-config/types/namespace-get.proto rename to svc/pkg/identity-config/proto/namespace-get.proto diff --git a/svc/pkg/identity-config/types/version-get.proto b/svc/pkg/identity-config/proto/version-get.proto similarity index 100% rename from svc/pkg/identity-config/types/version-get.proto rename to svc/pkg/identity-config/proto/version-get.proto diff --git a/svc/pkg/identity-config/types/version-prepare.proto b/svc/pkg/identity-config/proto/version-prepare.proto similarity index 100% rename from svc/pkg/identity-config/types/version-prepare.proto rename to svc/pkg/identity-config/proto/version-prepare.proto diff --git a/svc/pkg/identity-config/types/version-publish.proto b/svc/pkg/identity-config/proto/version-publish.proto similarity index 100% rename from svc/pkg/identity-config/types/version-publish.proto rename to svc/pkg/identity-config/proto/version-publish.proto diff --git a/svc/pkg/ip/types/info.proto b/svc/pkg/ip/proto/info.proto similarity index 100% rename from svc/pkg/ip/types/info.proto rename to svc/pkg/ip/proto/info.proto diff --git a/svc/pkg/job-log/types/msg/export-complete.proto b/svc/pkg/job-log/proto/msg/export-complete.proto similarity index 100% rename from svc/pkg/job-log/types/msg/export-complete.proto rename to svc/pkg/job-log/proto/msg/export-complete.proto diff --git a/svc/pkg/job-log/types/msg/export.proto b/svc/pkg/job-log/proto/msg/export.proto similarity index 100% rename from svc/pkg/job-log/types/msg/export.proto rename to svc/pkg/job-log/proto/msg/export.proto diff --git a/svc/pkg/job-log/types/read.proto b/svc/pkg/job-log/proto/read.proto similarity index 100% rename from svc/pkg/job-log/types/read.proto rename to svc/pkg/job-log/proto/read.proto diff --git a/svc/pkg/job-run/types/get.proto b/svc/pkg/job-run/proto/get.proto similarity index 100% rename from svc/pkg/job-run/types/get.proto rename to svc/pkg/job-run/proto/get.proto diff --git a/svc/pkg/job-run/types/metrics-log.proto b/svc/pkg/job-run/proto/metrics-log.proto similarity index 100% rename from svc/pkg/job-run/types/metrics-log.proto rename to svc/pkg/job-run/proto/metrics-log.proto diff --git a/svc/pkg/job-run/types/msg/alloc-planned.proto b/svc/pkg/job-run/proto/msg/alloc-planned.proto similarity index 100% rename from svc/pkg/job-run/types/msg/alloc-planned.proto rename to svc/pkg/job-run/proto/msg/alloc-planned.proto diff --git a/svc/pkg/job-run/types/msg/cleanup-complete.proto b/svc/pkg/job-run/proto/msg/cleanup-complete.proto similarity index 100% rename from svc/pkg/job-run/types/msg/cleanup-complete.proto rename to svc/pkg/job-run/proto/msg/cleanup-complete.proto diff --git a/svc/pkg/job-run/types/msg/cleanup.proto b/svc/pkg/job-run/proto/msg/cleanup.proto similarity index 100% rename from svc/pkg/job-run/types/msg/cleanup.proto rename to svc/pkg/job-run/proto/msg/cleanup.proto diff --git a/svc/pkg/job-run/types/msg/create-complete.proto b/svc/pkg/job-run/proto/msg/create-complete.proto similarity index 100% rename from svc/pkg/job-run/types/msg/create-complete.proto rename to svc/pkg/job-run/proto/msg/create-complete.proto diff --git a/svc/pkg/job-run/types/msg/create.proto b/svc/pkg/job-run/proto/msg/create.proto similarity index 100% rename from svc/pkg/job-run/types/msg/create.proto rename to svc/pkg/job-run/proto/msg/create.proto diff --git a/svc/pkg/job-run/types/msg/eval-complete.proto b/svc/pkg/job-run/proto/msg/eval-complete.proto similarity index 100% rename from svc/pkg/job-run/types/msg/eval-complete.proto rename to svc/pkg/job-run/proto/msg/eval-complete.proto diff --git a/svc/pkg/job-run/types/msg/fail.proto b/svc/pkg/job-run/proto/msg/fail.proto similarity index 100% rename from svc/pkg/job-run/types/msg/fail.proto rename to svc/pkg/job-run/proto/msg/fail.proto diff --git a/svc/pkg/job-run/types/msg/finished.proto b/svc/pkg/job-run/proto/msg/finished.proto similarity index 100% rename from svc/pkg/job-run/types/msg/finished.proto rename to svc/pkg/job-run/proto/msg/finished.proto diff --git a/svc/pkg/job-run/types/msg/ports-resolved.proto b/svc/pkg/job-run/proto/msg/ports-resolved.proto similarity index 100% rename from svc/pkg/job-run/types/msg/ports-resolved.proto rename to svc/pkg/job-run/proto/msg/ports-resolved.proto diff --git a/svc/pkg/job-run/types/msg/started.proto b/svc/pkg/job-run/proto/msg/started.proto similarity index 100% rename from svc/pkg/job-run/types/msg/started.proto rename to svc/pkg/job-run/proto/msg/started.proto diff --git a/svc/pkg/job-run/types/msg/stop.proto b/svc/pkg/job-run/proto/msg/stop.proto similarity index 100% rename from svc/pkg/job-run/types/msg/stop.proto rename to svc/pkg/job-run/proto/msg/stop.proto diff --git a/svc/pkg/job-run/types/msg/traefik-create-complete.proto b/svc/pkg/job-run/proto/msg/traefik-create-complete.proto similarity index 100% rename from svc/pkg/job-run/types/msg/traefik-create-complete.proto rename to svc/pkg/job-run/proto/msg/traefik-create-complete.proto diff --git a/svc/pkg/job/types/redis-job.proto b/svc/pkg/job/proto/redis-job.proto similarity index 100% rename from svc/pkg/job/types/redis-job.proto rename to svc/pkg/job/proto/redis-job.proto diff --git a/svc/pkg/kv-config/types/namespace-create.proto b/svc/pkg/kv-config/proto/namespace-create.proto similarity index 100% rename from svc/pkg/kv-config/types/namespace-create.proto rename to svc/pkg/kv-config/proto/namespace-create.proto diff --git a/svc/pkg/kv-config/types/namespace-get.proto b/svc/pkg/kv-config/proto/namespace-get.proto similarity index 100% rename from svc/pkg/kv-config/types/namespace-get.proto rename to svc/pkg/kv-config/proto/namespace-get.proto diff --git a/svc/pkg/kv-config/types/version-get.proto b/svc/pkg/kv-config/proto/version-get.proto similarity index 100% rename from svc/pkg/kv-config/types/version-get.proto rename to svc/pkg/kv-config/proto/version-get.proto diff --git a/svc/pkg/kv-config/types/version-prepare.proto b/svc/pkg/kv-config/proto/version-prepare.proto similarity index 100% rename from svc/pkg/kv-config/types/version-prepare.proto rename to svc/pkg/kv-config/proto/version-prepare.proto diff --git a/svc/pkg/kv-config/types/version-publish.proto b/svc/pkg/kv-config/proto/version-publish.proto similarity index 100% rename from svc/pkg/kv-config/types/version-publish.proto rename to svc/pkg/kv-config/proto/version-publish.proto diff --git a/svc/pkg/kv/types/get.proto b/svc/pkg/kv/proto/get.proto similarity index 100% rename from svc/pkg/kv/types/get.proto rename to svc/pkg/kv/proto/get.proto diff --git a/svc/pkg/kv/types/list.proto b/svc/pkg/kv/proto/list.proto similarity index 100% rename from svc/pkg/kv/types/list.proto rename to svc/pkg/kv/proto/list.proto diff --git a/svc/pkg/kv/types/msg/directory-update.proto b/svc/pkg/kv/proto/msg/directory-update.proto similarity index 100% rename from svc/pkg/kv/types/msg/directory-update.proto rename to svc/pkg/kv/proto/msg/directory-update.proto diff --git a/svc/pkg/kv/types/msg/update.proto b/svc/pkg/kv/proto/msg/update.proto similarity index 100% rename from svc/pkg/kv/types/msg/update.proto rename to svc/pkg/kv/proto/msg/update.proto diff --git a/svc/pkg/kv/types/msg/write.proto b/svc/pkg/kv/proto/msg/write.proto similarity index 100% rename from svc/pkg/kv/types/msg/write.proto rename to svc/pkg/kv/proto/msg/write.proto diff --git a/svc/pkg/linode/types/instance-type-get.proto b/svc/pkg/linode/proto/instance-type-get.proto similarity index 100% rename from svc/pkg/linode/types/instance-type-get.proto rename to svc/pkg/linode/proto/instance-type-get.proto diff --git a/svc/pkg/linode/types/msg/prebake-install-complete.proto b/svc/pkg/linode/proto/msg/prebake-install-complete.proto similarity index 100% rename from svc/pkg/linode/types/msg/prebake-install-complete.proto rename to svc/pkg/linode/proto/msg/prebake-install-complete.proto diff --git a/svc/pkg/linode/types/msg/prebake-provision.proto b/svc/pkg/linode/proto/msg/prebake-provision.proto similarity index 100% rename from svc/pkg/linode/types/msg/prebake-provision.proto rename to svc/pkg/linode/proto/msg/prebake-provision.proto diff --git a/svc/pkg/linode/types/server-destroy.proto b/svc/pkg/linode/proto/server-destroy.proto similarity index 100% rename from svc/pkg/linode/types/server-destroy.proto rename to svc/pkg/linode/proto/server-destroy.proto diff --git a/svc/pkg/linode/types/server-provision.proto b/svc/pkg/linode/proto/server-provision.proto similarity index 100% rename from svc/pkg/linode/types/server-provision.proto rename to svc/pkg/linode/proto/server-provision.proto diff --git a/svc/pkg/mm-config/types/game-get.proto b/svc/pkg/mm-config/proto/game-get.proto similarity index 100% rename from svc/pkg/mm-config/types/game-get.proto rename to svc/pkg/mm-config/proto/game-get.proto diff --git a/svc/pkg/mm-config/types/game-upsert.proto b/svc/pkg/mm-config/proto/game-upsert.proto similarity index 100% rename from svc/pkg/mm-config/types/game-upsert.proto rename to svc/pkg/mm-config/proto/game-upsert.proto diff --git a/svc/pkg/mm-config/types/lobby-group-get.proto b/svc/pkg/mm-config/proto/lobby-group-get.proto similarity index 100% rename from svc/pkg/mm-config/types/lobby-group-get.proto rename to svc/pkg/mm-config/proto/lobby-group-get.proto diff --git a/svc/pkg/mm-config/types/lobby-group-resolve-name-id.proto b/svc/pkg/mm-config/proto/lobby-group-resolve-name-id.proto similarity index 100% rename from svc/pkg/mm-config/types/lobby-group-resolve-name-id.proto rename to svc/pkg/mm-config/proto/lobby-group-resolve-name-id.proto diff --git a/svc/pkg/mm-config/types/lobby-group-resolve-version.proto b/svc/pkg/mm-config/proto/lobby-group-resolve-version.proto similarity index 100% rename from svc/pkg/mm-config/types/lobby-group-resolve-version.proto rename to svc/pkg/mm-config/proto/lobby-group-resolve-version.proto diff --git a/svc/pkg/mm-config/types/namespace-config-set.proto b/svc/pkg/mm-config/proto/namespace-config-set.proto similarity index 100% rename from svc/pkg/mm-config/types/namespace-config-set.proto rename to svc/pkg/mm-config/proto/namespace-config-set.proto diff --git a/svc/pkg/mm-config/types/namespace-config-validate.proto b/svc/pkg/mm-config/proto/namespace-config-validate.proto similarity index 100% rename from svc/pkg/mm-config/types/namespace-config-validate.proto rename to svc/pkg/mm-config/proto/namespace-config-validate.proto diff --git a/svc/pkg/mm-config/types/namespace-create.proto b/svc/pkg/mm-config/proto/namespace-create.proto similarity index 100% rename from svc/pkg/mm-config/types/namespace-create.proto rename to svc/pkg/mm-config/proto/namespace-create.proto diff --git a/svc/pkg/mm-config/types/namespace-get.proto b/svc/pkg/mm-config/proto/namespace-get.proto similarity index 100% rename from svc/pkg/mm-config/types/namespace-get.proto rename to svc/pkg/mm-config/proto/namespace-get.proto diff --git a/svc/pkg/mm-config/types/version-get.proto b/svc/pkg/mm-config/proto/version-get.proto similarity index 100% rename from svc/pkg/mm-config/types/version-get.proto rename to svc/pkg/mm-config/proto/version-get.proto diff --git a/svc/pkg/mm-config/types/version-prepare.proto b/svc/pkg/mm-config/proto/version-prepare.proto similarity index 100% rename from svc/pkg/mm-config/types/version-prepare.proto rename to svc/pkg/mm-config/proto/version-prepare.proto diff --git a/svc/pkg/mm-config/types/version-publish.proto b/svc/pkg/mm-config/proto/version-publish.proto similarity index 100% rename from svc/pkg/mm-config/types/version-publish.proto rename to svc/pkg/mm-config/proto/version-publish.proto diff --git a/svc/pkg/mm/types/dev-player-token-create.proto b/svc/pkg/mm/proto/dev-player-token-create.proto similarity index 100% rename from svc/pkg/mm/types/dev-player-token-create.proto rename to svc/pkg/mm/proto/dev-player-token-create.proto diff --git a/svc/pkg/mm/types/lobby-find-fail.proto b/svc/pkg/mm/proto/lobby-find-fail.proto similarity index 100% rename from svc/pkg/mm/types/lobby-find-fail.proto rename to svc/pkg/mm/proto/lobby-find-fail.proto diff --git a/svc/pkg/mm/types/lobby-find-lobby-query-list.proto b/svc/pkg/mm/proto/lobby-find-lobby-query-list.proto similarity index 100% rename from svc/pkg/mm/types/lobby-find-lobby-query-list.proto rename to svc/pkg/mm/proto/lobby-find-lobby-query-list.proto diff --git a/svc/pkg/mm/types/lobby-find-try-complete.proto b/svc/pkg/mm/proto/lobby-find-try-complete.proto similarity index 100% rename from svc/pkg/mm/types/lobby-find-try-complete.proto rename to svc/pkg/mm/proto/lobby-find-try-complete.proto diff --git a/svc/pkg/mm/types/lobby-for-run-id.proto b/svc/pkg/mm/proto/lobby-for-run-id.proto similarity index 100% rename from svc/pkg/mm/types/lobby-for-run-id.proto rename to svc/pkg/mm/proto/lobby-for-run-id.proto diff --git a/svc/pkg/mm/types/lobby-get.proto b/svc/pkg/mm/proto/lobby-get.proto similarity index 100% rename from svc/pkg/mm/types/lobby-get.proto rename to svc/pkg/mm/proto/lobby-get.proto diff --git a/svc/pkg/mm/types/lobby-history-export.proto b/svc/pkg/mm/proto/lobby-history-export.proto similarity index 100% rename from svc/pkg/mm/types/lobby-history-export.proto rename to svc/pkg/mm/proto/lobby-history-export.proto diff --git a/svc/pkg/mm/types/lobby-history.proto b/svc/pkg/mm/proto/lobby-history.proto similarity index 100% rename from svc/pkg/mm/types/lobby-history.proto rename to svc/pkg/mm/proto/lobby-history.proto diff --git a/svc/pkg/mm/types/lobby-idle-update.proto b/svc/pkg/mm/proto/lobby-idle-update.proto similarity index 100% rename from svc/pkg/mm/types/lobby-idle-update.proto rename to svc/pkg/mm/proto/lobby-idle-update.proto diff --git a/svc/pkg/mm/types/lobby-list-for-namespace.proto b/svc/pkg/mm/proto/lobby-list-for-namespace.proto similarity index 100% rename from svc/pkg/mm/types/lobby-list-for-namespace.proto rename to svc/pkg/mm/proto/lobby-list-for-namespace.proto diff --git a/svc/pkg/mm/types/lobby-list-for-user-id.proto b/svc/pkg/mm/proto/lobby-list-for-user-id.proto similarity index 100% rename from svc/pkg/mm/types/lobby-list-for-user-id.proto rename to svc/pkg/mm/proto/lobby-list-for-user-id.proto diff --git a/svc/pkg/mm/types/lobby-player-count.proto b/svc/pkg/mm/proto/lobby-player-count.proto similarity index 100% rename from svc/pkg/mm/types/lobby-player-count.proto rename to svc/pkg/mm/proto/lobby-player-count.proto diff --git a/svc/pkg/mm/types/lobby-runtime-aggregate.proto b/svc/pkg/mm/proto/lobby-runtime-aggregate.proto similarity index 100% rename from svc/pkg/mm/types/lobby-runtime-aggregate.proto rename to svc/pkg/mm/proto/lobby-runtime-aggregate.proto diff --git a/svc/pkg/mm/types/lobby-state-get.proto b/svc/pkg/mm/proto/lobby-state-get.proto similarity index 100% rename from svc/pkg/mm/types/lobby-state-get.proto rename to svc/pkg/mm/proto/lobby-state-get.proto diff --git a/svc/pkg/mm/types/msg/lobby-cleanup-complete.proto b/svc/pkg/mm/proto/msg/lobby-cleanup-complete.proto similarity index 100% rename from svc/pkg/mm/types/msg/lobby-cleanup-complete.proto rename to svc/pkg/mm/proto/msg/lobby-cleanup-complete.proto diff --git a/svc/pkg/mm/types/msg/lobby-cleanup.proto b/svc/pkg/mm/proto/msg/lobby-cleanup.proto similarity index 100% rename from svc/pkg/mm/types/msg/lobby-cleanup.proto rename to svc/pkg/mm/proto/msg/lobby-cleanup.proto diff --git a/svc/pkg/mm/types/msg/lobby-closed-set-complete.proto b/svc/pkg/mm/proto/msg/lobby-closed-set-complete.proto similarity index 100% rename from svc/pkg/mm/types/msg/lobby-closed-set-complete.proto rename to svc/pkg/mm/proto/msg/lobby-closed-set-complete.proto diff --git a/svc/pkg/mm/types/msg/lobby-closed-set.proto b/svc/pkg/mm/proto/msg/lobby-closed-set.proto similarity index 100% rename from svc/pkg/mm/types/msg/lobby-closed-set.proto rename to svc/pkg/mm/proto/msg/lobby-closed-set.proto diff --git a/svc/pkg/mm/types/msg/lobby-create-complete.proto b/svc/pkg/mm/proto/msg/lobby-create-complete.proto similarity index 100% rename from svc/pkg/mm/types/msg/lobby-create-complete.proto rename to svc/pkg/mm/proto/msg/lobby-create-complete.proto diff --git a/svc/pkg/mm/types/msg/lobby-create-fail.proto b/svc/pkg/mm/proto/msg/lobby-create-fail.proto similarity index 100% rename from svc/pkg/mm/types/msg/lobby-create-fail.proto rename to svc/pkg/mm/proto/msg/lobby-create-fail.proto diff --git a/svc/pkg/mm/types/msg/lobby-create.proto b/svc/pkg/mm/proto/msg/lobby-create.proto similarity index 100% rename from svc/pkg/mm/types/msg/lobby-create.proto rename to svc/pkg/mm/proto/msg/lobby-create.proto diff --git a/svc/pkg/mm/types/msg/lobby-find-complete.proto b/svc/pkg/mm/proto/msg/lobby-find-complete.proto similarity index 100% rename from svc/pkg/mm/types/msg/lobby-find-complete.proto rename to svc/pkg/mm/proto/msg/lobby-find-complete.proto diff --git a/svc/pkg/mm/types/msg/lobby-find-fail.proto b/svc/pkg/mm/proto/msg/lobby-find-fail.proto similarity index 100% rename from svc/pkg/mm/types/msg/lobby-find-fail.proto rename to svc/pkg/mm/proto/msg/lobby-find-fail.proto diff --git a/svc/pkg/mm/types/msg/lobby-find.proto b/svc/pkg/mm/proto/msg/lobby-find.proto similarity index 100% rename from svc/pkg/mm/types/msg/lobby-find.proto rename to svc/pkg/mm/proto/msg/lobby-find.proto diff --git a/svc/pkg/mm/types/msg/lobby-history-export-complete.proto b/svc/pkg/mm/proto/msg/lobby-history-export-complete.proto similarity index 100% rename from svc/pkg/mm/types/msg/lobby-history-export-complete.proto rename to svc/pkg/mm/proto/msg/lobby-history-export-complete.proto diff --git a/svc/pkg/mm/types/msg/lobby-history-export.proto b/svc/pkg/mm/proto/msg/lobby-history-export.proto similarity index 100% rename from svc/pkg/mm/types/msg/lobby-history-export.proto rename to svc/pkg/mm/proto/msg/lobby-history-export.proto diff --git a/svc/pkg/mm/types/msg/lobby-ready-complete.proto b/svc/pkg/mm/proto/msg/lobby-ready-complete.proto similarity index 100% rename from svc/pkg/mm/types/msg/lobby-ready-complete.proto rename to svc/pkg/mm/proto/msg/lobby-ready-complete.proto diff --git a/svc/pkg/mm/types/msg/lobby-ready.proto b/svc/pkg/mm/proto/msg/lobby-ready.proto similarity index 100% rename from svc/pkg/mm/types/msg/lobby-ready.proto rename to svc/pkg/mm/proto/msg/lobby-ready.proto diff --git a/svc/pkg/mm/types/msg/lobby-state-set-complete.proto b/svc/pkg/mm/proto/msg/lobby-state-set-complete.proto similarity index 100% rename from svc/pkg/mm/types/msg/lobby-state-set-complete.proto rename to svc/pkg/mm/proto/msg/lobby-state-set-complete.proto diff --git a/svc/pkg/mm/types/msg/lobby-state-set.proto b/svc/pkg/mm/proto/msg/lobby-state-set.proto similarity index 100% rename from svc/pkg/mm/types/msg/lobby-state-set.proto rename to svc/pkg/mm/proto/msg/lobby-state-set.proto diff --git a/svc/pkg/mm/types/msg/lobby-stop.proto b/svc/pkg/mm/proto/msg/lobby-stop.proto similarity index 100% rename from svc/pkg/mm/types/msg/lobby-stop.proto rename to svc/pkg/mm/proto/msg/lobby-stop.proto diff --git a/svc/pkg/mm/types/msg/nomad-node-closed-set.proto b/svc/pkg/mm/proto/msg/nomad-node-closed-set.proto similarity index 100% rename from svc/pkg/mm/types/msg/nomad-node-closed-set.proto rename to svc/pkg/mm/proto/msg/nomad-node-closed-set.proto diff --git a/svc/pkg/mm/types/msg/player-create-complete.proto b/svc/pkg/mm/proto/msg/player-create-complete.proto similarity index 100% rename from svc/pkg/mm/types/msg/player-create-complete.proto rename to svc/pkg/mm/proto/msg/player-create-complete.proto diff --git a/svc/pkg/mm/types/msg/player-register-complete.proto b/svc/pkg/mm/proto/msg/player-register-complete.proto similarity index 100% rename from svc/pkg/mm/types/msg/player-register-complete.proto rename to svc/pkg/mm/proto/msg/player-register-complete.proto diff --git a/svc/pkg/mm/types/msg/player-register-fail.proto b/svc/pkg/mm/proto/msg/player-register-fail.proto similarity index 100% rename from svc/pkg/mm/types/msg/player-register-fail.proto rename to svc/pkg/mm/proto/msg/player-register-fail.proto diff --git a/svc/pkg/mm/types/msg/player-register.proto b/svc/pkg/mm/proto/msg/player-register.proto similarity index 100% rename from svc/pkg/mm/types/msg/player-register.proto rename to svc/pkg/mm/proto/msg/player-register.proto diff --git a/svc/pkg/mm/types/msg/player-remove-complete.proto b/svc/pkg/mm/proto/msg/player-remove-complete.proto similarity index 100% rename from svc/pkg/mm/types/msg/player-remove-complete.proto rename to svc/pkg/mm/proto/msg/player-remove-complete.proto diff --git a/svc/pkg/mm/types/msg/player-remove-fail.proto b/svc/pkg/mm/proto/msg/player-remove-fail.proto similarity index 100% rename from svc/pkg/mm/types/msg/player-remove-fail.proto rename to svc/pkg/mm/proto/msg/player-remove-fail.proto diff --git a/svc/pkg/mm/types/msg/player-remove.proto b/svc/pkg/mm/proto/msg/player-remove.proto similarity index 100% rename from svc/pkg/mm/types/msg/player-remove.proto rename to svc/pkg/mm/proto/msg/player-remove.proto diff --git a/svc/pkg/mm/types/player-count-for-namespace.proto b/svc/pkg/mm/proto/player-count-for-namespace.proto similarity index 100% rename from svc/pkg/mm/types/player-count-for-namespace.proto rename to svc/pkg/mm/proto/player-count-for-namespace.proto diff --git a/svc/pkg/mm/types/player-get.proto b/svc/pkg/mm/proto/player-get.proto similarity index 100% rename from svc/pkg/mm/types/player-get.proto rename to svc/pkg/mm/proto/player-get.proto diff --git a/svc/pkg/nomad/types/msg/nomad-monitor-alloc-plan.proto b/svc/pkg/nomad/proto/msg/nomad-monitor-alloc-plan.proto similarity index 100% rename from svc/pkg/nomad/types/msg/nomad-monitor-alloc-plan.proto rename to svc/pkg/nomad/proto/msg/nomad-monitor-alloc-plan.proto diff --git a/svc/pkg/nomad/types/msg/nomad-monitor-alloc-update.proto b/svc/pkg/nomad/proto/msg/nomad-monitor-alloc-update.proto similarity index 100% rename from svc/pkg/nomad/types/msg/nomad-monitor-alloc-update.proto rename to svc/pkg/nomad/proto/msg/nomad-monitor-alloc-update.proto diff --git a/svc/pkg/nomad/types/msg/nomad-monitor-eval-update.proto b/svc/pkg/nomad/proto/msg/nomad-monitor-eval-update.proto similarity index 100% rename from svc/pkg/nomad/types/msg/nomad-monitor-eval-update.proto rename to svc/pkg/nomad/proto/msg/nomad-monitor-eval-update.proto diff --git a/svc/pkg/nomad/types/msg/nomad-monitor-node-drain-complete.proto b/svc/pkg/nomad/proto/msg/nomad-monitor-node-drain-complete.proto similarity index 100% rename from svc/pkg/nomad/types/msg/nomad-monitor-node-drain-complete.proto rename to svc/pkg/nomad/proto/msg/nomad-monitor-node-drain-complete.proto diff --git a/svc/pkg/nomad/types/msg/nomad-monitor-node-registered.proto b/svc/pkg/nomad/proto/msg/nomad-monitor-node-registered.proto similarity index 100% rename from svc/pkg/nomad/types/msg/nomad-monitor-node-registered.proto rename to svc/pkg/nomad/proto/msg/nomad-monitor-node-registered.proto diff --git a/svc/pkg/nsfw/types/image-score.proto b/svc/pkg/nsfw/proto/image-score.proto similarity index 100% rename from svc/pkg/nsfw/types/image-score.proto rename to svc/pkg/nsfw/proto/image-score.proto diff --git a/svc/pkg/perf/types/log-get.proto b/svc/pkg/perf/proto/log-get.proto similarity index 100% rename from svc/pkg/perf/types/log-get.proto rename to svc/pkg/perf/proto/log-get.proto diff --git a/svc/pkg/profanity/types/check.proto b/svc/pkg/profanity/proto/check.proto similarity index 100% rename from svc/pkg/profanity/types/check.proto rename to svc/pkg/profanity/proto/check.proto diff --git a/svc/pkg/region/types/get.proto b/svc/pkg/region/proto/get.proto similarity index 100% rename from svc/pkg/region/types/get.proto rename to svc/pkg/region/proto/get.proto diff --git a/svc/pkg/region/types/list-for-game.proto b/svc/pkg/region/proto/list-for-game.proto similarity index 100% rename from svc/pkg/region/types/list-for-game.proto rename to svc/pkg/region/proto/list-for-game.proto diff --git a/svc/pkg/region/types/list.proto b/svc/pkg/region/proto/list.proto similarity index 100% rename from svc/pkg/region/types/list.proto rename to svc/pkg/region/proto/list.proto diff --git a/svc/pkg/region/types/recommend.proto b/svc/pkg/region/proto/recommend.proto similarity index 100% rename from svc/pkg/region/types/recommend.proto rename to svc/pkg/region/proto/recommend.proto diff --git a/svc/pkg/region/types/resolve-for-game.proto b/svc/pkg/region/proto/resolve-for-game.proto similarity index 100% rename from svc/pkg/region/types/resolve-for-game.proto rename to svc/pkg/region/proto/resolve-for-game.proto diff --git a/svc/pkg/region/types/resolve.proto b/svc/pkg/region/proto/resolve.proto similarity index 100% rename from svc/pkg/region/types/resolve.proto rename to svc/pkg/region/proto/resolve.proto diff --git a/svc/pkg/team-invite/types/get.proto b/svc/pkg/team-invite/proto/get.proto similarity index 100% rename from svc/pkg/team-invite/types/get.proto rename to svc/pkg/team-invite/proto/get.proto diff --git a/svc/pkg/team-invite/types/msg/consume-fail.proto b/svc/pkg/team-invite/proto/msg/consume-fail.proto similarity index 100% rename from svc/pkg/team-invite/types/msg/consume-fail.proto rename to svc/pkg/team-invite/proto/msg/consume-fail.proto diff --git a/svc/pkg/team-invite/types/msg/consume.proto b/svc/pkg/team-invite/proto/msg/consume.proto similarity index 100% rename from svc/pkg/team-invite/types/msg/consume.proto rename to svc/pkg/team-invite/proto/msg/consume.proto diff --git a/svc/pkg/team-invite/types/msg/create-complete.proto b/svc/pkg/team-invite/proto/msg/create-complete.proto similarity index 100% rename from svc/pkg/team-invite/types/msg/create-complete.proto rename to svc/pkg/team-invite/proto/msg/create-complete.proto diff --git a/svc/pkg/team-invite/types/msg/create.proto b/svc/pkg/team-invite/proto/msg/create.proto similarity index 100% rename from svc/pkg/team-invite/types/msg/create.proto rename to svc/pkg/team-invite/proto/msg/create.proto diff --git a/svc/pkg/team/types/avatar-upload-complete.proto b/svc/pkg/team/proto/avatar-upload-complete.proto similarity index 100% rename from svc/pkg/team/types/avatar-upload-complete.proto rename to svc/pkg/team/proto/avatar-upload-complete.proto diff --git a/svc/pkg/team/types/get.proto b/svc/pkg/team/proto/get.proto similarity index 100% rename from svc/pkg/team/types/get.proto rename to svc/pkg/team/proto/get.proto diff --git a/svc/pkg/team/types/join-request-list.proto b/svc/pkg/team/proto/join-request-list.proto similarity index 100% rename from svc/pkg/team/types/join-request-list.proto rename to svc/pkg/team/proto/join-request-list.proto diff --git a/svc/pkg/team/types/member-count.proto b/svc/pkg/team/proto/member-count.proto similarity index 100% rename from svc/pkg/team/types/member-count.proto rename to svc/pkg/team/proto/member-count.proto diff --git a/svc/pkg/team/types/member-get.proto b/svc/pkg/team/proto/member-get.proto similarity index 100% rename from svc/pkg/team/types/member-get.proto rename to svc/pkg/team/proto/member-get.proto diff --git a/svc/pkg/team/types/member-list.proto b/svc/pkg/team/proto/member-list.proto similarity index 100% rename from svc/pkg/team/types/member-list.proto rename to svc/pkg/team/proto/member-list.proto diff --git a/svc/pkg/team/types/member-relationship-get.proto b/svc/pkg/team/proto/member-relationship-get.proto similarity index 100% rename from svc/pkg/team/types/member-relationship-get.proto rename to svc/pkg/team/proto/member-relationship-get.proto diff --git a/svc/pkg/team/types/msg/create-complete.proto b/svc/pkg/team/proto/msg/create-complete.proto similarity index 100% rename from svc/pkg/team/types/msg/create-complete.proto rename to svc/pkg/team/proto/msg/create-complete.proto diff --git a/svc/pkg/team/types/msg/create-fail.proto b/svc/pkg/team/proto/msg/create-fail.proto similarity index 100% rename from svc/pkg/team/types/msg/create-fail.proto rename to svc/pkg/team/proto/msg/create-fail.proto diff --git a/svc/pkg/team/types/msg/create.proto b/svc/pkg/team/proto/msg/create.proto similarity index 100% rename from svc/pkg/team/types/msg/create.proto rename to svc/pkg/team/proto/msg/create.proto diff --git a/svc/pkg/team/types/msg/deactivated-update.proto b/svc/pkg/team/proto/msg/deactivated-update.proto similarity index 100% rename from svc/pkg/team/types/msg/deactivated-update.proto rename to svc/pkg/team/proto/msg/deactivated-update.proto diff --git a/svc/pkg/team/types/msg/join-request-create-complete.proto b/svc/pkg/team/proto/msg/join-request-create-complete.proto similarity index 100% rename from svc/pkg/team/types/msg/join-request-create-complete.proto rename to svc/pkg/team/proto/msg/join-request-create-complete.proto diff --git a/svc/pkg/team/types/msg/join-request-create-fail.proto b/svc/pkg/team/proto/msg/join-request-create-fail.proto similarity index 100% rename from svc/pkg/team/types/msg/join-request-create-fail.proto rename to svc/pkg/team/proto/msg/join-request-create-fail.proto diff --git a/svc/pkg/team/types/msg/join-request-create.proto b/svc/pkg/team/proto/msg/join-request-create.proto similarity index 100% rename from svc/pkg/team/types/msg/join-request-create.proto rename to svc/pkg/team/proto/msg/join-request-create.proto diff --git a/svc/pkg/team/types/msg/join-request-resolve-complete.proto b/svc/pkg/team/proto/msg/join-request-resolve-complete.proto similarity index 100% rename from svc/pkg/team/types/msg/join-request-resolve-complete.proto rename to svc/pkg/team/proto/msg/join-request-resolve-complete.proto diff --git a/svc/pkg/team/types/msg/join-request-resolve.proto b/svc/pkg/team/proto/msg/join-request-resolve.proto similarity index 100% rename from svc/pkg/team/types/msg/join-request-resolve.proto rename to svc/pkg/team/proto/msg/join-request-resolve.proto diff --git a/svc/pkg/team/types/msg/member-create-complete.proto b/svc/pkg/team/proto/msg/member-create-complete.proto similarity index 100% rename from svc/pkg/team/types/msg/member-create-complete.proto rename to svc/pkg/team/proto/msg/member-create-complete.proto diff --git a/svc/pkg/team/types/msg/member-create-fail.proto b/svc/pkg/team/proto/msg/member-create-fail.proto similarity index 100% rename from svc/pkg/team/types/msg/member-create-fail.proto rename to svc/pkg/team/proto/msg/member-create-fail.proto diff --git a/svc/pkg/team/types/msg/member-create.proto b/svc/pkg/team/proto/msg/member-create.proto similarity index 100% rename from svc/pkg/team/types/msg/member-create.proto rename to svc/pkg/team/proto/msg/member-create.proto diff --git a/svc/pkg/team/types/msg/member-kick-complete.proto b/svc/pkg/team/proto/msg/member-kick-complete.proto similarity index 100% rename from svc/pkg/team/types/msg/member-kick-complete.proto rename to svc/pkg/team/proto/msg/member-kick-complete.proto diff --git a/svc/pkg/team/types/msg/member-kick.proto b/svc/pkg/team/proto/msg/member-kick.proto similarity index 100% rename from svc/pkg/team/types/msg/member-kick.proto rename to svc/pkg/team/proto/msg/member-kick.proto diff --git a/svc/pkg/team/types/msg/member-remove-complete.proto b/svc/pkg/team/proto/msg/member-remove-complete.proto similarity index 100% rename from svc/pkg/team/types/msg/member-remove-complete.proto rename to svc/pkg/team/proto/msg/member-remove-complete.proto diff --git a/svc/pkg/team/types/msg/member-remove.proto b/svc/pkg/team/proto/msg/member-remove.proto similarity index 100% rename from svc/pkg/team/types/msg/member-remove.proto rename to svc/pkg/team/proto/msg/member-remove.proto diff --git a/svc/pkg/team/types/msg/owner-transfer-complete.proto b/svc/pkg/team/proto/msg/owner-transfer-complete.proto similarity index 100% rename from svc/pkg/team/types/msg/owner-transfer-complete.proto rename to svc/pkg/team/proto/msg/owner-transfer-complete.proto diff --git a/svc/pkg/team/types/msg/owner-transfer.proto b/svc/pkg/team/proto/msg/owner-transfer.proto similarity index 100% rename from svc/pkg/team/types/msg/owner-transfer.proto rename to svc/pkg/team/proto/msg/owner-transfer.proto diff --git a/svc/pkg/team/types/msg/profile-set-complete.proto b/svc/pkg/team/proto/msg/profile-set-complete.proto similarity index 100% rename from svc/pkg/team/types/msg/profile-set-complete.proto rename to svc/pkg/team/proto/msg/profile-set-complete.proto diff --git a/svc/pkg/team/types/msg/profile-set-fail.proto b/svc/pkg/team/proto/msg/profile-set-fail.proto similarity index 100% rename from svc/pkg/team/types/msg/profile-set-fail.proto rename to svc/pkg/team/proto/msg/profile-set-fail.proto diff --git a/svc/pkg/team/types/msg/profile-set.proto b/svc/pkg/team/proto/msg/profile-set.proto similarity index 100% rename from svc/pkg/team/types/msg/profile-set.proto rename to svc/pkg/team/proto/msg/profile-set.proto diff --git a/svc/pkg/team/types/msg/update.proto b/svc/pkg/team/proto/msg/update.proto similarity index 100% rename from svc/pkg/team/types/msg/update.proto rename to svc/pkg/team/proto/msg/update.proto diff --git a/svc/pkg/team/types/msg/user-ban-complete.proto b/svc/pkg/team/proto/msg/user-ban-complete.proto similarity index 100% rename from svc/pkg/team/types/msg/user-ban-complete.proto rename to svc/pkg/team/proto/msg/user-ban-complete.proto diff --git a/svc/pkg/team/types/msg/user-ban.proto b/svc/pkg/team/proto/msg/user-ban.proto similarity index 100% rename from svc/pkg/team/types/msg/user-ban.proto rename to svc/pkg/team/proto/msg/user-ban.proto diff --git a/svc/pkg/team/types/msg/user-unban-complete.proto b/svc/pkg/team/proto/msg/user-unban-complete.proto similarity index 100% rename from svc/pkg/team/types/msg/user-unban-complete.proto rename to svc/pkg/team/proto/msg/user-unban-complete.proto diff --git a/svc/pkg/team/types/msg/user-unban.proto b/svc/pkg/team/proto/msg/user-unban.proto similarity index 100% rename from svc/pkg/team/types/msg/user-unban.proto rename to svc/pkg/team/proto/msg/user-unban.proto diff --git a/svc/pkg/team/types/profile-validate.proto b/svc/pkg/team/proto/profile-validate.proto similarity index 100% rename from svc/pkg/team/types/profile-validate.proto rename to svc/pkg/team/proto/profile-validate.proto diff --git a/svc/pkg/team/types/recommend.proto b/svc/pkg/team/proto/recommend.proto similarity index 100% rename from svc/pkg/team/types/recommend.proto rename to svc/pkg/team/proto/recommend.proto diff --git a/svc/pkg/team/types/resolve-display-name.proto b/svc/pkg/team/proto/resolve-display-name.proto similarity index 100% rename from svc/pkg/team/types/resolve-display-name.proto rename to svc/pkg/team/proto/resolve-display-name.proto diff --git a/svc/pkg/team/types/search.proto b/svc/pkg/team/proto/search.proto similarity index 100% rename from svc/pkg/team/types/search.proto rename to svc/pkg/team/proto/search.proto diff --git a/svc/pkg/team/types/user-ban-get.proto b/svc/pkg/team/proto/user-ban-get.proto similarity index 100% rename from svc/pkg/team/types/user-ban-get.proto rename to svc/pkg/team/proto/user-ban-get.proto diff --git a/svc/pkg/team/types/user-ban-list.proto b/svc/pkg/team/proto/user-ban-list.proto similarity index 100% rename from svc/pkg/team/types/user-ban-list.proto rename to svc/pkg/team/proto/user-ban-list.proto diff --git a/svc/pkg/team/types/validate.proto b/svc/pkg/team/proto/validate.proto similarity index 100% rename from svc/pkg/team/types/validate.proto rename to svc/pkg/team/proto/validate.proto diff --git a/svc/pkg/tier/types/list.proto b/svc/pkg/tier/proto/list.proto similarity index 100% rename from svc/pkg/tier/types/list.proto rename to svc/pkg/tier/proto/list.proto diff --git a/svc/pkg/token/types/create.proto b/svc/pkg/token/proto/create.proto similarity index 100% rename from svc/pkg/token/types/create.proto rename to svc/pkg/token/proto/create.proto diff --git a/svc/pkg/token/types/exchange.proto b/svc/pkg/token/proto/exchange.proto similarity index 100% rename from svc/pkg/token/types/exchange.proto rename to svc/pkg/token/proto/exchange.proto diff --git a/svc/pkg/token/types/get.proto b/svc/pkg/token/proto/get.proto similarity index 100% rename from svc/pkg/token/types/get.proto rename to svc/pkg/token/proto/get.proto diff --git a/svc/pkg/token/types/revoke.proto b/svc/pkg/token/proto/revoke.proto similarity index 100% rename from svc/pkg/token/types/revoke.proto rename to svc/pkg/token/proto/revoke.proto diff --git a/svc/pkg/upload/types/complete.proto b/svc/pkg/upload/proto/complete.proto similarity index 100% rename from svc/pkg/upload/types/complete.proto rename to svc/pkg/upload/proto/complete.proto diff --git a/svc/pkg/upload/types/delete.proto b/svc/pkg/upload/proto/delete.proto similarity index 100% rename from svc/pkg/upload/types/delete.proto rename to svc/pkg/upload/proto/delete.proto diff --git a/svc/pkg/upload/types/file-list.proto b/svc/pkg/upload/proto/file-list.proto similarity index 100% rename from svc/pkg/upload/types/file-list.proto rename to svc/pkg/upload/proto/file-list.proto diff --git a/svc/pkg/upload/types/get.proto b/svc/pkg/upload/proto/get.proto similarity index 100% rename from svc/pkg/upload/types/get.proto rename to svc/pkg/upload/proto/get.proto diff --git a/svc/pkg/upload/types/list-for-user.proto b/svc/pkg/upload/proto/list-for-user.proto similarity index 100% rename from svc/pkg/upload/types/list-for-user.proto rename to svc/pkg/upload/proto/list-for-user.proto diff --git a/svc/pkg/upload/types/msg/complete-complete.proto b/svc/pkg/upload/proto/msg/complete-complete.proto similarity index 100% rename from svc/pkg/upload/types/msg/complete-complete.proto rename to svc/pkg/upload/proto/msg/complete-complete.proto diff --git a/svc/pkg/upload/types/msg/delete-complete.proto b/svc/pkg/upload/proto/msg/delete-complete.proto similarity index 100% rename from svc/pkg/upload/types/msg/delete-complete.proto rename to svc/pkg/upload/proto/msg/delete-complete.proto diff --git a/svc/pkg/upload/types/msg/delete.proto b/svc/pkg/upload/proto/msg/delete.proto similarity index 100% rename from svc/pkg/upload/types/msg/delete.proto rename to svc/pkg/upload/proto/msg/delete.proto diff --git a/svc/pkg/upload/types/prepare.proto b/svc/pkg/upload/proto/prepare.proto similarity index 100% rename from svc/pkg/upload/types/prepare.proto rename to svc/pkg/upload/proto/prepare.proto diff --git a/svc/pkg/user-dev/types/msg/create.proto b/svc/pkg/user-dev/proto/msg/create.proto similarity index 100% rename from svc/pkg/user-dev/types/msg/create.proto rename to svc/pkg/user-dev/proto/msg/create.proto diff --git a/svc/pkg/user-dev/types/msg/game-update.proto b/svc/pkg/user-dev/proto/msg/game-update.proto similarity index 100% rename from svc/pkg/user-dev/types/msg/game-update.proto rename to svc/pkg/user-dev/proto/msg/game-update.proto diff --git a/svc/pkg/user-dev/types/msg/request-complete.proto b/svc/pkg/user-dev/proto/msg/request-complete.proto similarity index 100% rename from svc/pkg/user-dev/types/msg/request-complete.proto rename to svc/pkg/user-dev/proto/msg/request-complete.proto diff --git a/svc/pkg/user-dev/types/msg/request-resolve-complete.proto b/svc/pkg/user-dev/proto/msg/request-resolve-complete.proto similarity index 100% rename from svc/pkg/user-dev/types/msg/request-resolve-complete.proto rename to svc/pkg/user-dev/proto/msg/request-resolve-complete.proto diff --git a/svc/pkg/user-dev/types/msg/request-resolve.proto b/svc/pkg/user-dev/proto/msg/request-resolve.proto similarity index 100% rename from svc/pkg/user-dev/types/msg/request-resolve.proto rename to svc/pkg/user-dev/proto/msg/request-resolve.proto diff --git a/svc/pkg/user-dev/types/msg/request.proto b/svc/pkg/user-dev/proto/msg/request.proto similarity index 100% rename from svc/pkg/user-dev/types/msg/request.proto rename to svc/pkg/user-dev/proto/msg/request.proto diff --git a/svc/pkg/user-follow/types/count.proto b/svc/pkg/user-follow/proto/count.proto similarity index 100% rename from svc/pkg/user-follow/types/count.proto rename to svc/pkg/user-follow/proto/count.proto diff --git a/svc/pkg/user-follow/types/get.proto b/svc/pkg/user-follow/proto/get.proto similarity index 100% rename from svc/pkg/user-follow/types/get.proto rename to svc/pkg/user-follow/proto/get.proto diff --git a/svc/pkg/user-follow/types/list.proto b/svc/pkg/user-follow/proto/list.proto similarity index 100% rename from svc/pkg/user-follow/types/list.proto rename to svc/pkg/user-follow/proto/list.proto diff --git a/svc/pkg/user-follow/types/msg/create.proto b/svc/pkg/user-follow/proto/msg/create.proto similarity index 100% rename from svc/pkg/user-follow/types/msg/create.proto rename to svc/pkg/user-follow/proto/msg/create.proto diff --git a/svc/pkg/user-follow/types/msg/delete.proto b/svc/pkg/user-follow/proto/msg/delete.proto similarity index 100% rename from svc/pkg/user-follow/types/msg/delete.proto rename to svc/pkg/user-follow/proto/msg/delete.proto diff --git a/svc/pkg/user-follow/types/msg/request-ignore-complete.proto b/svc/pkg/user-follow/proto/msg/request-ignore-complete.proto similarity index 100% rename from svc/pkg/user-follow/types/msg/request-ignore-complete.proto rename to svc/pkg/user-follow/proto/msg/request-ignore-complete.proto diff --git a/svc/pkg/user-follow/types/msg/request-ignore.proto b/svc/pkg/user-follow/proto/msg/request-ignore.proto similarity index 100% rename from svc/pkg/user-follow/types/msg/request-ignore.proto rename to svc/pkg/user-follow/proto/msg/request-ignore.proto diff --git a/svc/pkg/user-follow/types/relationship-get.proto b/svc/pkg/user-follow/proto/relationship-get.proto similarity index 100% rename from svc/pkg/user-follow/types/relationship-get.proto rename to svc/pkg/user-follow/proto/relationship-get.proto diff --git a/svc/pkg/user-follow/types/request-list.proto b/svc/pkg/user-follow/proto/request-list.proto similarity index 100% rename from svc/pkg/user-follow/types/request-list.proto rename to svc/pkg/user-follow/proto/request-list.proto diff --git a/svc/pkg/user-follow/types/toggle.proto b/svc/pkg/user-follow/proto/toggle.proto similarity index 100% rename from svc/pkg/user-follow/types/toggle.proto rename to svc/pkg/user-follow/proto/toggle.proto diff --git a/svc/pkg/user-identity/types/create.proto b/svc/pkg/user-identity/proto/create.proto similarity index 100% rename from svc/pkg/user-identity/types/create.proto rename to svc/pkg/user-identity/proto/create.proto diff --git a/svc/pkg/user-identity/types/delete.proto b/svc/pkg/user-identity/proto/delete.proto similarity index 100% rename from svc/pkg/user-identity/types/delete.proto rename to svc/pkg/user-identity/proto/delete.proto diff --git a/svc/pkg/user-identity/types/get.proto b/svc/pkg/user-identity/proto/get.proto similarity index 100% rename from svc/pkg/user-identity/types/get.proto rename to svc/pkg/user-identity/proto/get.proto diff --git a/svc/pkg/user-identity/types/msg/create-complete.proto b/svc/pkg/user-identity/proto/msg/create-complete.proto similarity index 100% rename from svc/pkg/user-identity/types/msg/create-complete.proto rename to svc/pkg/user-identity/proto/msg/create-complete.proto diff --git a/svc/pkg/user-presence/types/get.proto b/svc/pkg/user-presence/proto/get.proto similarity index 100% rename from svc/pkg/user-presence/types/get.proto rename to svc/pkg/user-presence/proto/get.proto diff --git a/svc/pkg/user-presence/types/leave.proto b/svc/pkg/user-presence/proto/leave.proto similarity index 100% rename from svc/pkg/user-presence/types/leave.proto rename to svc/pkg/user-presence/proto/leave.proto diff --git a/svc/pkg/user-presence/types/msg/arrive.proto b/svc/pkg/user-presence/proto/msg/arrive.proto similarity index 100% rename from svc/pkg/user-presence/types/msg/arrive.proto rename to svc/pkg/user-presence/proto/msg/arrive.proto diff --git a/svc/pkg/user-presence/types/msg/game-activity-set.proto b/svc/pkg/user-presence/proto/msg/game-activity-set.proto similarity index 100% rename from svc/pkg/user-presence/types/msg/game-activity-set.proto rename to svc/pkg/user-presence/proto/msg/game-activity-set.proto diff --git a/svc/pkg/user-presence/types/msg/leave.proto b/svc/pkg/user-presence/proto/msg/leave.proto similarity index 100% rename from svc/pkg/user-presence/types/msg/leave.proto rename to svc/pkg/user-presence/proto/msg/leave.proto diff --git a/svc/pkg/user-presence/types/msg/status-set.proto b/svc/pkg/user-presence/proto/msg/status-set.proto similarity index 100% rename from svc/pkg/user-presence/types/msg/status-set.proto rename to svc/pkg/user-presence/proto/msg/status-set.proto diff --git a/svc/pkg/user-presence/types/msg/update.proto b/svc/pkg/user-presence/proto/msg/update.proto similarity index 100% rename from svc/pkg/user-presence/types/msg/update.proto rename to svc/pkg/user-presence/proto/msg/update.proto diff --git a/svc/pkg/user-presence/types/touch.proto b/svc/pkg/user-presence/proto/touch.proto similarity index 100% rename from svc/pkg/user-presence/types/touch.proto rename to svc/pkg/user-presence/proto/touch.proto diff --git a/svc/pkg/user-report/types/msg/create.proto b/svc/pkg/user-report/proto/msg/create.proto similarity index 100% rename from svc/pkg/user-report/types/msg/create.proto rename to svc/pkg/user-report/proto/msg/create.proto diff --git a/svc/pkg/user/types/avatar-upload-complete.proto b/svc/pkg/user/proto/avatar-upload-complete.proto similarity index 100% rename from svc/pkg/user/types/avatar-upload-complete.proto rename to svc/pkg/user/proto/avatar-upload-complete.proto diff --git a/svc/pkg/user/types/get.proto b/svc/pkg/user/proto/get.proto similarity index 100% rename from svc/pkg/user/types/get.proto rename to svc/pkg/user/proto/get.proto diff --git a/svc/pkg/user/types/msg/admin-set.proto b/svc/pkg/user/proto/msg/admin-set.proto similarity index 100% rename from svc/pkg/user/types/msg/admin-set.proto rename to svc/pkg/user/proto/msg/admin-set.proto diff --git a/svc/pkg/user/types/msg/create-complete.proto b/svc/pkg/user/proto/msg/create-complete.proto similarity index 100% rename from svc/pkg/user/types/msg/create-complete.proto rename to svc/pkg/user/proto/msg/create-complete.proto diff --git a/svc/pkg/user/types/msg/create.proto b/svc/pkg/user/proto/msg/create.proto similarity index 100% rename from svc/pkg/user/types/msg/create.proto rename to svc/pkg/user/proto/msg/create.proto diff --git a/svc/pkg/user/types/msg/delete-complete.proto b/svc/pkg/user/proto/msg/delete-complete.proto similarity index 100% rename from svc/pkg/user/types/msg/delete-complete.proto rename to svc/pkg/user/proto/msg/delete-complete.proto diff --git a/svc/pkg/user/types/msg/delete.proto b/svc/pkg/user/proto/msg/delete.proto similarity index 100% rename from svc/pkg/user/types/msg/delete.proto rename to svc/pkg/user/proto/msg/delete.proto diff --git a/svc/pkg/user/types/msg/event.proto b/svc/pkg/user/proto/msg/event.proto similarity index 100% rename from svc/pkg/user/types/msg/event.proto rename to svc/pkg/user/proto/msg/event.proto diff --git a/svc/pkg/user/types/msg/mm-lobby-join.proto b/svc/pkg/user/proto/msg/mm-lobby-join.proto similarity index 100% rename from svc/pkg/user/types/msg/mm-lobby-join.proto rename to svc/pkg/user/proto/msg/mm-lobby-join.proto diff --git a/svc/pkg/user/types/msg/mutual-follow-create.proto b/svc/pkg/user/proto/msg/mutual-follow-create.proto similarity index 100% rename from svc/pkg/user/types/msg/mutual-follow-create.proto rename to svc/pkg/user/proto/msg/mutual-follow-create.proto diff --git a/svc/pkg/user/types/msg/mutual-follow-delete.proto b/svc/pkg/user/proto/msg/mutual-follow-delete.proto similarity index 100% rename from svc/pkg/user/types/msg/mutual-follow-delete.proto rename to svc/pkg/user/proto/msg/mutual-follow-delete.proto diff --git a/svc/pkg/user/types/msg/profile-set.proto b/svc/pkg/user/proto/msg/profile-set.proto similarity index 100% rename from svc/pkg/user/types/msg/profile-set.proto rename to svc/pkg/user/proto/msg/profile-set.proto diff --git a/svc/pkg/user/types/msg/search-update.proto b/svc/pkg/user/proto/msg/search-update.proto similarity index 100% rename from svc/pkg/user/types/msg/search-update.proto rename to svc/pkg/user/proto/msg/search-update.proto diff --git a/svc/pkg/user/types/msg/update.proto b/svc/pkg/user/proto/msg/update.proto similarity index 100% rename from svc/pkg/user/types/msg/update.proto rename to svc/pkg/user/proto/msg/update.proto diff --git a/svc/pkg/user/types/msg/updated.proto b/svc/pkg/user/proto/msg/updated.proto similarity index 100% rename from svc/pkg/user/types/msg/updated.proto rename to svc/pkg/user/proto/msg/updated.proto diff --git a/svc/pkg/user/types/mutual-friend-list.proto b/svc/pkg/user/proto/mutual-friend-list.proto similarity index 100% rename from svc/pkg/user/types/mutual-friend-list.proto rename to svc/pkg/user/proto/mutual-friend-list.proto diff --git a/svc/pkg/user/types/my-test.proto b/svc/pkg/user/proto/my-test.proto similarity index 100% rename from svc/pkg/user/types/my-test.proto rename to svc/pkg/user/proto/my-test.proto diff --git a/svc/pkg/user/types/pending-delete-toggle.proto b/svc/pkg/user/proto/pending-delete-toggle.proto similarity index 100% rename from svc/pkg/user/types/pending-delete-toggle.proto rename to svc/pkg/user/proto/pending-delete-toggle.proto diff --git a/svc/pkg/user/types/profile-validate.proto b/svc/pkg/user/proto/profile-validate.proto similarity index 100% rename from svc/pkg/user/types/profile-validate.proto rename to svc/pkg/user/proto/profile-validate.proto diff --git a/svc/pkg/user/types/resolve-access-token.proto b/svc/pkg/user/proto/resolve-access-token.proto similarity index 100% rename from svc/pkg/user/types/resolve-access-token.proto rename to svc/pkg/user/proto/resolve-access-token.proto diff --git a/svc/pkg/user/types/resolve-email.proto b/svc/pkg/user/proto/resolve-email.proto similarity index 100% rename from svc/pkg/user/types/resolve-email.proto rename to svc/pkg/user/proto/resolve-email.proto diff --git a/svc/pkg/user/types/search.proto b/svc/pkg/user/proto/search.proto similarity index 100% rename from svc/pkg/user/types/search.proto rename to svc/pkg/user/proto/search.proto diff --git a/svc/pkg/user/types/team-list.proto b/svc/pkg/user/proto/team-list.proto similarity index 100% rename from svc/pkg/user/types/team-list.proto rename to svc/pkg/user/proto/team-list.proto diff --git a/svc/pkg/user/types/token-create.proto b/svc/pkg/user/proto/token-create.proto similarity index 100% rename from svc/pkg/user/types/token-create.proto rename to svc/pkg/user/proto/token-create.proto diff --git a/svc/templates/types/msg/{{ name }}.proto b/svc/templates/proto/msg/{{ name }}.proto similarity index 100% rename from svc/templates/types/msg/{{ name }}.proto rename to svc/templates/proto/msg/{{ name }}.proto diff --git a/svc/templates/types/{{ name }}.proto b/svc/templates/proto/{{ name }}.proto similarity index 100% rename from svc/templates/types/{{ name }}.proto rename to svc/templates/proto/{{ name }}.proto