diff --git a/Cargo.toml b/Cargo.toml
index 7ea439e2..a0c0f9d4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,7 +75,7 @@ jsonwebtoken = "9.3.0"
 sha2 = "0.10"
 
 # Client-specific
-reqwest = { version = "0.12", default-features = false, features = ["json", "blocking", "multipart"] }
+reqwest = { version = "0.12", default-features = false, features = ["json", "blocking", "multipart", "native-tls"] }
 sysinfo = "0.29"
 hostname = "0.4.1"
 json5 = "0.4"
diff --git a/src/client/mod.rs b/src/client.rs
similarity index 100%
rename from src/client/mod.rs
rename to src/client.rs
diff --git a/src/client/apis/mod.rs b/src/client/apis.rs
similarity index 100%
rename from src/client/apis/mod.rs
rename to src/client/apis.rs
diff --git a/src/client/commands/mod.rs b/src/client/commands.rs
similarity index 100%
rename from src/client/commands/mod.rs
rename to src/client/commands.rs
diff --git a/src/client/commands/pagination/mod.rs b/src/client/commands/pagination.rs
similarity index 100%
rename from src/client/commands/pagination/mod.rs
rename to src/client/commands/pagination.rs
diff --git a/src/client/hpc/mod.rs b/src/client/hpc.rs
similarity index 100%
rename from src/client/hpc/mod.rs
rename to src/client/hpc.rs
diff --git a/src/config/mod.rs b/src/config.rs
similarity index 100%
rename from src/config/mod.rs
rename to src/config.rs
diff --git a/src/lib.rs b/src/lib.rs
index 6e7fc15f..23a2568e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -37,8 +37,22 @@ pub mod plot_resources_cmd;
 #[cfg(all(feature = "client", feature = "tui", feature = "plot_resources"))]
 pub mod cli;
 
-// Re-export commonly used types
-pub use models::*;
+// Re-export model types explicitly
+pub use models::{
+    ClaimJobsBasedOnResources, ClaimJobsSortMethod, ClaimNextJobsResponse, ComputeNodeModel,
+    ComputeNodeSchedule, ComputeNodesResources, CreateJobsResponse, ErrorResponse, EventModel,
+    FileModel, GetDotGraphResponse, GetReadyJobRequirementsResponse, IsCompleteResponse,
+    JobDependencyModel, JobFileRelationshipModel, JobModel, JobStatus, JobStatusMap,
+    JobUserDataRelationshipModel, JobsModel, ListComputeNodesResponse, ListEventsResponse,
+    ListFilesResponse, ListJobDependenciesResponse, ListJobFileRelationshipsResponse,
+    ListJobUserDataRelationshipsResponse, ListJobsResponse, ListLocalSchedulersResponse,
+    ListMissingUserDataResponse, ListRequiredExistingFilesResponse,
+    ListResourceRequirementsResponse, ListResultsResponse, ListScheduledComputeNodesResponse,
+    ListSlurmSchedulersResponse, ListUserDataResponse, ListWorkflowsResponse, LocalSchedulerModel,
+    ProcessChangedJobInputsResponse, ResourceRequirementsModel, ResultModel,
+    ScheduledComputeNodesModel, SlurmSchedulerModel, UserDataModel, WorkflowActionModel,
+    WorkflowModel, WorkflowStatusModel,
+};
 
 // Re-export client types when client feature is enabled
 #[cfg(feature = "client")]
diff --git a/src/server/mod.rs b/src/server.rs
similarity index 100%
rename from src/server/mod.rs
rename to src/server.rs
diff --git a/src/server/api/mod.rs b/src/server/api.rs
similarity index 100%
rename from src/server/api/mod.rs
rename to src/server/api.rs
diff --git a/src/server/dashboard/mod.rs b/src/server/dashboard.rs
similarity index 100%
rename from src/server/dashboard/mod.rs
rename to src/server/dashboard.rs
diff --git a/src/tui/mod.rs b/src/tui.rs
similarity index 100%
rename from src/tui/mod.rs
rename to src/tui.rs
diff --git a/tests/common/mod.rs b/tests/common.rs
similarity index 100%
rename from tests/common/mod.rs
rename to tests/common.rs
diff --git a/torc-slurm-job-runner/Cargo.toml b/torc-slurm-job-runner/Cargo.toml
index 5683f125..4d8347ae 100644
--- a/torc-slurm-job-runner/Cargo.toml
+++ b/torc-slurm-job-runner/Cargo.toml
@@ -1,14 +1,17 @@
 [package]
 name = "torc-slurm-job-runner"
-version = "0.7.0"
-edition = "2024"
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+description = "Torc Slurm job runner for HPC environments"
 
 [dependencies]
 torc = { path = ".." }
-clap = { version = "4.5.4", features = ["derive", "color"] }
-env_logger = "0.11.1"
-log = "0.4"
-chrono = "0.4.38"
-hostname = "0.4.0"
+clap.workspace = true
+env_logger.workspace = true
+log.workspace = true
+chrono.workspace = true
+hostname.workspace = true
 serde_json.workspace = true
 signal-hook.workspace = true