refactor/move "plugins" crate to pertain only to services

Cargo.toml

@@ -12,11 +12,6 @@ members = [
   "crates/cli/database_backup",
   "crates/cli/database_cleanup",
 
-  # Plugins are complete subsystems that can be plugged into services (users, billing, etc.)
-  "crates/plugins/billing",
-  "crates/plugins/inference_workloads",
-  "crates/plugins/users",
-
   # Shared libraries
   "crates/lib/cloud_storage",
   "crates/lib/config",
@@ -50,4 +45,9 @@ members = [
   "crates/service/web/image_generation_service",
   "crates/service/web/storyteller_web",
   "crates/service/web/websocket_gateway",
+
+  # Service Plugins: complete subsystems that can be plugged into services (users, billing, etc.)
+  "crates/service/plugins/billing",
+  "crates/service/plugins/inference_workloads",
+  "crates/service/plugins/users",
 ]

crates/service/plugins/billing/Cargo.toml

@@ -15,11 +15,11 @@ path = "src/lib.rs"
 [dependencies]
 
 # Internal
-container_common = { path = "../../lib/container_common" }
-database_queries = { path = "../../lib/database_queries" }
-http_server_common = { path = "../../lib/http_server_common" }
-reusable_types = { path = "../../_types/reusable_types" }
-url_config = { path = "../../lib/url_config" }
+container_common = { path = "../../../lib/container_common" }
+database_queries = { path = "../../../lib/database_queries" }
+http_server_common = { path = "../../../lib/http_server_common" }
+reusable_types = { path = "../../../_types/reusable_types" }
+url_config = { path = "../../../lib/url_config" }
 
 # External
 anyhow = "1.0.40"

crates/service/plugins/inference_workloads/Cargo.toml

@@ -15,7 +15,7 @@ path = "src/lib.rs"
 [dependencies]
 
 # Internal
-container_common = { path = "../../lib/container_common" }
+container_common = { path = "../../../lib/container_common" }
 
 # External
 anyhow = "1.0.40"

crates/service/plugins/users/Cargo.toml

@@ -15,13 +15,13 @@ path = "src/lib.rs"
 [dependencies]
 
 # Internal
-container_common = { path = "../../lib/container_common" }
-database_queries = { path = "../../lib/database_queries" }
-enums = { path = "../../_types/enums" }
-http_server_common = { path = "../../lib/http_server_common" }
-reusable_types = { path = "../../_types/reusable_types" }
-tokens = { path = "../../_types/tokens" }
-user_input_common = { path = "../../lib/user_input_common" }
+container_common = { path = "../../../lib/container_common" }
+database_queries = { path = "../../../lib/database_queries" }
+enums = { path = "../../../_types/enums" }
+http_server_common = { path = "../../../lib/http_server_common" }
+reusable_types = { path = "../../../_types/reusable_types" }
+tokens = { path = "../../../_types/tokens" }
+user_input_common = { path = "../../../lib/user_input_common" }
 
 # External
 anyhow = "1.0.40"

crates/service/plugins/users/src/lib.rs

@@ -1,8 +1,8 @@
 #[macro_use] extern crate lazy_static;
 #[macro_use] extern crate serde_derive;
 
-pub const RESERVED_USERNAMES : &'static str = include_str!("../../../../db/reserved_usernames.txt");
-pub const RESERVED_SUBSTRINGS : &'static str = include_str!("../../../../db/reserved_usernames_including.txt");
+pub const RESERVED_USERNAMES : &'static str = include_str!("../../../../../db/reserved_usernames.txt");
+pub const RESERVED_SUBSTRINGS : &'static str = include_str!("../../../../../db/reserved_usernames_including.txt");
 
 pub mod default_routes;
 pub mod endpoints;

crates/service/web/storyteller_web/Cargo.toml

@@ -39,8 +39,8 @@ url_config = { path = "../../../lib/url_config" }
 user_input_common = { path = "../../../lib/user_input_common" }
 
 # Internal Components
-billing_component = { path = "../../../plugins/billing" }
-users_component = { path = "../../../plugins/users" }
+billing_component = { path = "../../plugins/billing" }
+users_component = { path = "../../plugins/users" }
 
 # Vendored code
 newrelic-telemetry = { path = "../../../vendor/newrelic-telemetry-sdk-rust" }