diff --git a/config/configuration.yaml b/config/configuration.yaml
index 496082d..20106c7 100644
--- a/config/configuration.yaml
+++ b/config/configuration.yaml
@@ -90,14 +90,6 @@ media_extractor:
 # https://www.home-assistant.io/integrations/mobile_app
 mobile_app:
 
-# https://www.home-assistant.io/docs/mqtt
-# TODO: Add to networking module
-mqtt:
-  broker: !secret mqtt_ip
-  client_id: homeassistant
-  username: !secret mqtt_username
-  password: !secret mqtt_password
-
 # https://www.home-assistant.io/integrations/notify
 notify:
   - name: telegram
@@ -105,17 +97,9 @@ notify:
     api_key: !secret telegram_token
     chat_id: !secret telegram_georgi_chat_id
 
-# https://www.home-assistant.io/integrations/wake_on_lan
-wake_on_lan:
-
 # https://www.home-assistant.io/integrations/zeroconf
 zeroconf:
 
-# https://www.home-assistant.io/integrations/zha
-zha:
-  usb_path: /dev/ttyUSB0
-  database_path: /config/zigbee.db
-
 #
 # ─── PLUGINS ────────────────────────────────────────────────────────────────────
 #
diff --git a/config/packages/modules/network.yaml b/config/packages/modules/network.yaml
index 9ae2b8c..fe2a173 100644
--- a/config/packages/modules/network.yaml
+++ b/config/packages/modules/network.yaml
@@ -1,16 +1,45 @@
+#
+# ─── INTEGRATIONS ───────────────────────────────────────────────────────────────
+#
+
+# https://www.home-assistant.io/integrations/fastdotcom
 fastdotcom:
+
+# https://www.home-assistant.io/integrations/speedtestdotnet
 speedtestdotnet:
 
+# https://www.home-assistant.io/integrations/wake_on_lan
+wake_on_lan:
+
+# https://www.home-assistant.io/integrations/mikrotik
 mikrotik:
   - name: Mikrotik
     host: !secret mikrotik_host
     username: !secret mikrotik_username
     password: !secret mikrotik_password
 
+# https://www.home-assistant.io/docs/mqtt
+mqtt:
+  broker: !secret mqtt_ip
+  client_id: homeassistant
+  username: !secret mqtt_username
+  password: !secret mqtt_password
+
+# https://www.home-assistant.io/integrations/pi_hole
 pi_hole:
   - host: !secret pihole_host
     api_key: !secret pihole_api_key
 
+# https://www.home-assistant.io/integrations/zha
+zha:
+  usb_path: /dev/ttyUSB0
+  database_path: /config/zigbee.db
+
+
+#
+# ─── ENTITIES ───────────────────────────────────────────────────────────────────
+#
+
 switch:
   - platform: command_line
     switches:
diff --git a/config/packages/modules/presence.yaml b/config/packages/modules/presence.yaml
index 0c7601a..051a6b4 100644
--- a/config/packages/modules/presence.yaml
+++ b/config/packages/modules/presence.yaml
@@ -1,5 +1,5 @@
 #
-# ─── CONFIGURATION ──────────────────────────────────────────────────────────────
+# ─── INTEGRATIONS ───────────────────────────────────────────────────────────────
 #
 
 # https://www.home-assistant.io/components/person