diff --git a/src/heartbeat/mod.rs b/src/data/heartbeat/mod.rs
similarity index 100%
rename from src/heartbeat/mod.rs
rename to src/data/heartbeat/mod.rs
diff --git a/src/heartbeat/model.rs b/src/data/heartbeat/model.rs
similarity index 100%
rename from src/heartbeat/model.rs
rename to src/data/heartbeat/model.rs
diff --git a/src/heartbeat/parser.rs b/src/data/heartbeat/parser.rs
similarity index 100%
rename from src/heartbeat/parser.rs
rename to src/data/heartbeat/parser.rs
diff --git a/src/data/mod.rs b/src/data/mod.rs
index 18a06e9..bd7d20d 100644
--- a/src/data/mod.rs
+++ b/src/data/mod.rs
@@ -1,2 +1,4 @@
 pub mod unified;
-pub use unified::unify_data;
+pub use unified::model::unify_data;
+pub mod heartbeat;
+pub mod status_page;
diff --git a/src/status_page/mod.rs b/src/data/status_page/mod.rs
similarity index 100%
rename from src/status_page/mod.rs
rename to src/data/status_page/mod.rs
diff --git a/src/status_page/model.rs b/src/data/status_page/model.rs
similarity index 100%
rename from src/status_page/model.rs
rename to src/data/status_page/model.rs
diff --git a/src/status_page/parser.rs b/src/data/status_page/parser.rs
similarity index 100%
rename from src/status_page/parser.rs
rename to src/data/status_page/parser.rs
diff --git a/src/data/unified/mod.rs b/src/data/unified/mod.rs
new file mode 100644
index 0000000..65880be
--- /dev/null
+++ b/src/data/unified/mod.rs
@@ -0,0 +1 @@
+pub mod model;
diff --git a/src/data/unified.rs b/src/data/unified/model.rs
similarity index 88%
rename from src/data/unified.rs
rename to src/data/unified/model.rs
index e035d0a..51d8e47 100644
--- a/src/data/unified.rs
+++ b/src/data/unified/model.rs
@@ -1,5 +1,5 @@
-use crate::heartbeat::model::{HeartbeatResponse, UptimeData};
-use crate::status_page::model::{MonitorInfo, StatusPageResponse};
+use crate::data::heartbeat::model::{HeartbeatResponse, UptimeData};
+use crate::data::status_page::model::{MonitorInfo, StatusPageResponse};
 
 #[derive(Debug, Clone)]
 pub struct UnifiedMonitorData {
diff --git a/src/main.rs b/src/main.rs
index bf1ad82..2051f9e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -7,8 +7,6 @@ use i18n::init_locales;
 
 use crate::data::unify_data;
 mod data;
-mod heartbeat;
-mod status_page;
 
 #[derive(Debug, Parser)]
 #[command(author, version, about)]
@@ -36,7 +34,7 @@ fn main() -> Result<()> {
 
     let heartbeat_data = if heartbeat_response.status().is_success() {
         let json_text = heartbeat_response.text()?;
-        heartbeat::parse_response(&json_text)?
+        data::heartbeat::parse_response(&json_text)?
     } else {
         return Err(anyhow::anyhow!(heartbeat_response.status()));
     };
@@ -46,7 +44,7 @@ fn main() -> Result<()> {
     let status_page_response = client.get(status_page_url).send()?;
     let status_page_data = if status_page_response.status().is_success() {
         let json_text = status_page_response.text()?;
-        status_page::parse_response(&json_text)?
+        data::status_page::parse_response(&json_text)?
     } else {
         return Err(anyhow::anyhow!(status_page_response.status()));
     };