diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..e69de29
diff --git a/src/msg_handler/handler.rs b/src/handler/handler_main.rs
similarity index 100%
rename from src/msg_handler/handler.rs
rename to src/handler/handler_main.rs
diff --git a/src/msg_handler/mod.rs b/src/handler/mod.rs
similarity index 58%
rename from src/msg_handler/mod.rs
rename to src/handler/mod.rs
index 87620b8..4f26d27 100644
--- a/src/msg_handler/mod.rs
+++ b/src/handler/mod.rs
@@ -1,7 +1,7 @@
-mod handler;
+mod handler_main;
 mod utils_headers;
 mod utils_request;
 mod utils_response;
 mod utils_synth_response;
 
-pub use handler::HttpMessageHandler;
+pub use handler_main::HttpMessageHandler;
diff --git a/src/msg_handler/utils_headers.rs b/src/handler/utils_headers.rs
similarity index 100%
rename from src/msg_handler/utils_headers.rs
rename to src/handler/utils_headers.rs
diff --git a/src/msg_handler/utils_request.rs b/src/handler/utils_request.rs
similarity index 100%
rename from src/msg_handler/utils_request.rs
rename to src/handler/utils_request.rs
diff --git a/src/msg_handler/utils_response.rs b/src/handler/utils_response.rs
similarity index 100%
rename from src/msg_handler/utils_response.rs
rename to src/handler/utils_response.rs
diff --git a/src/msg_handler/utils_synth_response.rs b/src/handler/utils_synth_response.rs
similarity index 100%
rename from src/msg_handler/utils_synth_response.rs
rename to src/handler/utils_synth_response.rs
diff --git a/src/main.rs b/src/main.rs
index 8c2473e..1e2996c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -11,8 +11,8 @@ mod config;
 mod constants;
 mod error;
 mod globals;
+mod handler;
 mod log;
-mod msg_handler;
 mod proxy;
 mod utils;
 
@@ -26,8 +26,8 @@ use crate::{
   proxy::Proxy,
 };
 use futures::future::select_all;
+use handler::HttpMessageHandler;
 use hyper::Client;
-use msg_handler::HttpMessageHandler;
 // use hyper_trust_dns::TrustDnsResolver;
 use rustc_hash::FxHashMap as HashMap;
 use std::{io::Write, sync::Arc};
diff --git a/src/proxy/proxy_main.rs b/src/proxy/proxy_main.rs
index e40b8a3..e482ff0 100644
--- a/src/proxy/proxy_main.rs
+++ b/src/proxy/proxy_main.rs
@@ -1,5 +1,5 @@
 // use super::proxy_handler::handle_request;
-use crate::{backend::ServerNameLC, error::*, globals::Globals, log::*, msg_handler::HttpMessageHandler};
+use crate::{backend::ServerNameLC, error::*, globals::Globals, handler::HttpMessageHandler, log::*};
 use hyper::{client::connect::Connect, server::conn::Http, service::service_fn, Body, Request};
 use std::{net::SocketAddr, sync::Arc};
 use tokio::{