diff --git a/examples/lamp/src/main.rs b/examples/lamp/src/main.rs
index 276e255..51816e6 100644
--- a/examples/lamp/src/main.rs
+++ b/examples/lamp/src/main.rs
@@ -43,14 +43,14 @@ async fn main() {
     // K8sAnywhereTopology as it is the most automatic one that enables you to easily deploy
     // locally, to development environment from a CI, to staging, and to production with settings
     // that automatically adapt to each environment grade.
-    let maestro = Maestro::<K8sAnywhereTopology>::initialize(
+    let mut maestro = Maestro::<K8sAnywhereTopology>::initialize(
         Inventory::autoload(),
         K8sAnywhereTopology::from_env(),
     )
     .await
     .unwrap();
 
-    // maestro.register_all(vec![Box::new(lamp_stack)]);
+    maestro.register_all(vec![Box::new(lamp_stack)]);
     // Here we bootstrap the CLI, this gives some nice features if you need them
     harmony_cli::init(maestro, None).await.unwrap();
 }
diff --git a/examples/monitoring/src/main.rs b/examples/monitoring/src/main.rs
index 0f7fc37..c2522f3 100644
--- a/examples/monitoring/src/main.rs
+++ b/examples/monitoring/src/main.rs
@@ -1,19 +1,18 @@
 use harmony::{
     inventory::Inventory,
     maestro::Maestro,
-    modules::monitoring::{
-        alert_channel::discord_alert_channel::DiscordWebhook,
-        alert_rule::prometheus_alert_rule::{AlertManagerRuleGroup, PrometheusAlertRule},
-        kube_prometheus::{
-            alerts::{
-                dell_server::{
-                    alert_global_storage_status_critical,
-                    alert_global_storage_status_non_recoverable,
-                    global_storage_status_degraded_non_critical,
-                },
-                pvc::high_pvc_fill_rate_over_two_days,
+    modules::{
+        monitoring::{
+            alert_channel::discord_alert_channel::DiscordWebhook,
+            alert_rule::prometheus_alert_rule::AlertManagerRuleGroup,
+            kube_prometheus::helm_prometheus_alert_score::HelmPrometheusAlertingScore,
+        },
+        prometheus::alerts::{
+            infra::dell_server::{
+                alert_global_storage_status_critical, alert_global_storage_status_non_recoverable,
+                global_storage_status_degraded_non_critical,
             },
-            helm_prometheus_alert_score::HelmPrometheusAlertingScore,
+            k8s::pvc::high_pvc_fill_rate_over_two_days,
         },
     },
     topology::{K8sAnywhereTopology, Url},
diff --git a/harmony/src/modules/mod.rs b/harmony/src/modules/mod.rs
index 1427515..ec5f050 100644
--- a/harmony/src/modules/mod.rs
+++ b/harmony/src/modules/mod.rs
@@ -12,5 +12,6 @@ pub mod load_balancer;
 pub mod monitoring;
 pub mod okd;
 pub mod opnsense;
+pub mod prometheus;
 pub mod tenant;
 pub mod tftp;
diff --git a/harmony/src/modules/monitoring/kube_prometheus/mod.rs b/harmony/src/modules/monitoring/kube_prometheus/mod.rs
index a9180e9..7c8233a 100644
--- a/harmony/src/modules/monitoring/kube_prometheus/mod.rs
+++ b/harmony/src/modules/monitoring/kube_prometheus/mod.rs
@@ -1,4 +1,3 @@
-pub mod alerts;
 pub mod helm;
 pub mod helm_prometheus_alert_score;
 pub mod prometheus;
diff --git a/harmony/src/modules/monitoring/kube_prometheus/alerts/dell_server.rs b/harmony/src/modules/prometheus/alerts/infra/dell_server.rs
similarity index 100%
rename from harmony/src/modules/monitoring/kube_prometheus/alerts/dell_server.rs
rename to harmony/src/modules/prometheus/alerts/infra/dell_server.rs
diff --git a/harmony/src/modules/monitoring/kube_prometheus/alerts/mod.rs b/harmony/src/modules/prometheus/alerts/infra/mod.rs
similarity index 61%
rename from harmony/src/modules/monitoring/kube_prometheus/alerts/mod.rs
rename to harmony/src/modules/prometheus/alerts/infra/mod.rs
index 50291ff..47fbc2f 100644
--- a/harmony/src/modules/monitoring/kube_prometheus/alerts/mod.rs
+++ b/harmony/src/modules/prometheus/alerts/infra/mod.rs
@@ -1,2 +1 @@
 pub mod dell_server;
-pub mod pvc;
diff --git a/harmony/src/modules/prometheus/alerts/k8s/mod.rs b/harmony/src/modules/prometheus/alerts/k8s/mod.rs
new file mode 100644
index 0000000..f01a9c8
--- /dev/null
+++ b/harmony/src/modules/prometheus/alerts/k8s/mod.rs
@@ -0,0 +1 @@
+pub mod pvc;
diff --git a/harmony/src/modules/monitoring/kube_prometheus/alerts/pvc.rs b/harmony/src/modules/prometheus/alerts/k8s/pvc.rs
similarity index 100%
rename from harmony/src/modules/monitoring/kube_prometheus/alerts/pvc.rs
rename to harmony/src/modules/prometheus/alerts/k8s/pvc.rs
diff --git a/harmony/src/modules/prometheus/alerts/mod.rs b/harmony/src/modules/prometheus/alerts/mod.rs
new file mode 100644
index 0000000..416e56f
--- /dev/null
+++ b/harmony/src/modules/prometheus/alerts/mod.rs
@@ -0,0 +1,2 @@
+pub mod infra;
+pub mod k8s;
diff --git a/harmony/src/modules/prometheus/mod.rs b/harmony/src/modules/prometheus/mod.rs
new file mode 100644
index 0000000..3a0c1d7
--- /dev/null
+++ b/harmony/src/modules/prometheus/mod.rs
@@ -0,0 +1 @@
+pub mod alerts;