diff --git a/aquatic_http/src/lib.rs b/aquatic_http/src/lib.rs
index 48ade1c..54ed266 100644
--- a/aquatic_http/src/lib.rs
+++ b/aquatic_http/src/lib.rs
@@ -15,9 +15,8 @@ use std::{
 use crate::config::Config;
 
 mod common;
+mod workers;
 pub mod config;
-mod handlers;
-mod network;
 
 pub const APP_NAME: &str = "aquatic_http: HTTP/TLS BitTorrent tracker";
 
@@ -86,7 +85,7 @@ pub fn run_inner(config: Config, state: State) -> anyhow::Result<()> {
                 WorkerIndex::SocketWorker(i),
             );
 
-            network::run_socket_worker(
+            workers::socket::run_socket_worker(
                 config,
                 state,
                 tls_config,
@@ -116,7 +115,7 @@ pub fn run_inner(config: Config, state: State) -> anyhow::Result<()> {
                 WorkerIndex::RequestWorker(i),
             );
 
-            handlers::run_request_worker(config, state, request_mesh_builder, response_mesh_builder)
+            workers::request::run_request_worker(config, state, request_mesh_builder, response_mesh_builder)
                 .await
         });
 
diff --git a/aquatic_http/src/workers/mod.rs b/aquatic_http/src/workers/mod.rs
new file mode 100644
index 0000000..5f41ab1
--- /dev/null
+++ b/aquatic_http/src/workers/mod.rs
@@ -0,0 +1,2 @@
+pub mod request;
+pub mod socket;
\ No newline at end of file
diff --git a/aquatic_http/src/handlers.rs b/aquatic_http/src/workers/request.rs
similarity index 100%
rename from aquatic_http/src/handlers.rs
rename to aquatic_http/src/workers/request.rs
diff --git a/aquatic_http/src/network.rs b/aquatic_http/src/workers/socket.rs
similarity index 99%
rename from aquatic_http/src/network.rs
rename to aquatic_http/src/workers/socket.rs
index 51ed339..a3fb70b 100644
--- a/aquatic_http/src/network.rs
+++ b/aquatic_http/src/workers/socket.rs
@@ -24,11 +24,9 @@ use glommio::timer::TimerActionRepeat;
 use glommio::{enclose, prelude::*};
 use slab::Slab;
 
-use crate::common::num_digits_in_usize;
+use crate::common::*;
 use crate::config::Config;
 
-use super::common::*;
-
 const INTERMEDIATE_BUFFER_SIZE: usize = 1024;
 const MAX_REQUEST_SIZE: usize = 2048;