diff --git a/src/main.rs b/src/main.rs
index cb639f9..1ad6c30 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -13,8 +13,6 @@ use axum_extra::TypedHeader;
 
 use futures::TryStreamExt;
 
-use nyazoom_headers::ForwardedFor;
-
 use sanitize_filename_reader_friendly::sanitize;
 
 use std::{io, net::SocketAddr, path::Path};
@@ -27,14 +25,12 @@ use tokio_util::{
 use tower_http::{limit::RequestBodyLimitLayer, services::ServeDir, trace::TraceLayer};
 
 mod cache;
-mod logging;
-mod nyazoom_headers;
-mod ssr;
 mod state;
-mod sweeper;
 mod util;
 mod views;
 
+use util::{headers::ForwardedFor, logging, ssr, sweeper};
+
 use state::{AppState, UploadRecord};
 
 use crate::state::*;
diff --git a/src/nyazoom_headers.rs b/src/util/headers.rs
similarity index 100%
rename from src/nyazoom_headers.rs
rename to src/util/headers.rs
diff --git a/src/logging.rs b/src/util/logging.rs
similarity index 100%
rename from src/logging.rs
rename to src/util/logging.rs
diff --git a/src/util/mod.rs b/src/util/mod.rs
index a869ca7..c1c9bcc 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -1,3 +1,8 @@
+pub mod headers;
+pub mod logging;
+pub mod ssr;
+pub mod sweeper;
+
 use rand::{
     distributions::{Alphanumeric, DistString},
     rngs::SmallRng,
diff --git a/src/ssr.rs b/src/util/ssr.rs
similarity index 100%
rename from src/ssr.rs
rename to src/util/ssr.rs
diff --git a/src/sweeper.rs b/src/util/sweeper.rs
similarity index 100%
rename from src/sweeper.rs
rename to src/util/sweeper.rs