diff --git a/src/adapters/driving/for_monitoring_alerts.rs b/src/adapters/driving/for_monitoring_alerts.rs
index 13f6a49..4cdae47 100644
--- a/src/adapters/driving/for_monitoring_alerts.rs
+++ b/src/adapters/driving/for_monitoring_alerts.rs
@@ -2,11 +2,11 @@ use crate::app::ports::driving::ForMonitoringAlerts;
 
 pub struct ForMonitoringAlertsAdapter
 {
-    app : crate::app::alert_service::AlertService
+    app : crate::app::services::alert_service::AlertService
 }
 
 impl ForMonitoringAlertsAdapter {
-    pub fn new(app: crate::app::alert_service::AlertService) -> Self {
+    pub fn new(app: crate::app::services::alert_service::AlertService) -> Self {
         ForMonitoringAlertsAdapter { app }
     }
 }
diff --git a/src/app/ports.rs b/src/app/ports.rs
deleted file mode 100644
index 4c76b42..0000000
--- a/src/app/ports.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod driven;
-pub mod driving;
diff --git a/src/app/service.rs b/src/app/service.rs
deleted file mode 100644
index a345db2..0000000
--- a/src/app/service.rs
+++ /dev/null
@@ -1,138 +0,0 @@
-use crate::app::ports::driven::{
-    ForFormattingMessage, ForMonitoringSystem, ForSendingNotification,
-};
-
-pub struct Service {
-    notifier: Box<dyn ForSendingNotification>,
-    monitor: Box<dyn ForMonitoringSystem>,
-    formatter: Box<dyn ForFormattingMessage>,
-}
-
-pub fn new(
-    notifier: Box<dyn ForSendingNotification>,
-    monitor: Box<dyn ForMonitoringSystem>,
-    formatter: Box<dyn ForFormattingMessage>,
-) -> Service {
-    Service {
-        notifier,
-        monitor,
-        formatter,
-    }
-}
-
-impl Service {
-    /// Check for threshold violations and send alerts
-    pub fn alert_on_threshold_violation(&self) -> Result<(), Box<dyn std::error::Error>> {
-        let violations = self.monitor.check_thresholds();
-        for violation in violations {
-            let message = self.formatter.format_violation(violation);
-            self.notifier.send_notification(&message)?;
-        }
-        
-        Ok(())
-    }
-
-    /// Send a final notification with all system information
-    pub fn send_all_metrics_notification(&self) -> Result<(), Box<dyn std::error::Error>> {
-        let summary = self.formatter.format_summary(&self.monitor.get_metrics());
-        self.notifier.send_notification(&summary)?;
-
-        Ok(())
-    }
-}
-
-
-#[cfg(test)]
-mod tests {
-    use std::collections::HashMap;
-
-    use crate::app::ports::driven::{MockForFormattingMessage, MockForMonitoringSystem, MockForSendingNotification};
-
-    use super::*;
-
-    #[test]
-    fn test_alert_on_threshold_violation() {
-        let mut notifier = MockForSendingNotification::new();
-        let mut monitor = MockForMonitoringSystem::new();
-        let mut formatter = MockForFormattingMessage::new();
-
-        notifier.expect_send_notification().returning(|_| Ok(()));
-        monitor.expect_check_thresholds().returning(|| vec![]);
-        monitor.expect_get_metrics().returning(|| HashMap::new());
-        formatter.expect_format_violation().returning(|_| "".to_string());
-        formatter.expect_format_summary().returning(|_| "".to_string());
-
-        let service = new(
-            Box::new(notifier),
-            Box::new(monitor),
-            Box::new(formatter),
-        );
-
-        assert!(service.alert_on_threshold_violation().is_ok());
-    }
-
-    #[test]
-    fn test_send_all_metrics_notification() {
-        let mut notifier = MockForSendingNotification::new();
-        let mut monitor = MockForMonitoringSystem::new();
-        let mut formatter = MockForFormattingMessage::new();
-
-        notifier.expect_send_notification().returning(|_| Ok(()));
-        monitor.expect_check_thresholds().returning(|| vec![]);
-        monitor.expect_get_metrics().returning(|| HashMap::new());
-        formatter.expect_format_violation().returning(|_| "".to_string());
-        formatter.expect_format_summary().returning(|_| "".to_string());
-
-        let service = new(
-            Box::new(notifier),
-            Box::new(monitor),
-            Box::new(formatter),
-        );
-
-        assert!(service.send_all_metrics_notification().is_ok());
-    }
-
-    #[test]
-    fn test_alert_on_threshold_violation_handles_send_error() {
-        let mut notifier = MockForSendingNotification::new();
-        let mut monitor = MockForMonitoringSystem::new();
-        let mut formatter = MockForFormattingMessage::new();
-
-        monitor.expect_check_thresholds().returning(|| {
-            vec![Box::new(crate::app::ports::driven::MockForGettingViolationData::new())]
-        });
-        formatter.expect_format_violation().returning(|_| "Test violation".to_string());
-        
-        notifier.expect_send_notification()
-            .returning(|_| Err("Network error".into()));
-
-        let service = new(
-            Box::new(notifier),
-            Box::new(monitor),
-            Box::new(formatter),
-        );
-
-        assert!(service.alert_on_threshold_violation().is_err());
-    }
-
-    #[test]
-    fn test_send_all_metrics_notification_handles_send_error() {
-        let mut notifier = MockForSendingNotification::new();
-        let mut monitor = MockForMonitoringSystem::new();
-        let mut formatter = MockForFormattingMessage::new();
-
-        monitor.expect_get_metrics().returning(|| HashMap::new());
-        formatter.expect_format_summary().returning(|_| "Test summary".to_string());
-        
-        notifier.expect_send_notification()
-            .returning(|_| Err("Network error".into()));
-
-        let service = new(
-            Box::new(notifier),
-            Box::new(monitor),
-            Box::new(formatter),
-        );
-
-        assert!(service.send_all_metrics_notification().is_err());
-    }
-}
diff --git a/src/app/alert_service.rs b/src/app/services/alert_service.rs
similarity index 100%
rename from src/app/alert_service.rs
rename to src/app/services/alert_service.rs
diff --git a/src/app/metric_service.rs b/src/app/services/metric_service.rs
similarity index 100%
rename from src/app/metric_service.rs
rename to src/app/services/metric_service.rs
diff --git a/src/configurator.rs b/src/configurator.rs
index 484f2a1..48f14c1 100644
--- a/src/configurator.rs
+++ b/src/configurator.rs
@@ -23,7 +23,7 @@ pub fn get_cron_actor(
 
     let formatter = actors::driven::for_formatting_message::alert_formatter::AlertFormatter;
 
-    let service = app::alert_service::new(
+    let service = app::services::alert_service::new(
         Box::new(discord_adapter),
         Box::new(system_monitor_adapter),
         Box::new(formatter),
@@ -34,7 +34,7 @@ pub fn get_cron_actor(
     actors::driving::cron_alerts::CronAlertsActor::new(Box::new(service_adapter), duration)
 }
 
-pub fn get_get_service() -> app::metric_service::MetricService {
+pub fn get_get_service() -> app::services::metric_service::MetricService {
     let notifier = actors::driven::for_sending_notification::print::StdoutNotificationActor::new();
 
     let monitor =
@@ -44,7 +44,7 @@ pub fn get_get_service() -> app::metric_service::MetricService {
 
     let formatter = actors::driven::for_formatting_message::alert_formatter::AlertFormatter;
 
-    app::metric_service::new(
+    app::services::metric_service::new(
         Box::new(notifier),
         Box::new(system_monitor_adapter),
         Box::new(formatter),
diff --git a/src/main.rs b/src/main.rs
index 90c649c..7cb1971 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,9 +1,14 @@
 use clap::{Parser, Subcommand};
 
 mod app {
-    pub mod alert_service;
-    pub mod metric_service;
-    pub mod ports;
+    pub mod services {
+        pub mod alert_service;
+        pub mod metric_service;
+    }
+    pub mod ports {
+        pub mod driven;
+        pub mod driving;
+    }
 }
 
 mod adapters {