diff --git a/conf/default.yml b/conf/default.yml
index ba0653c94..183b45600 100644
--- a/conf/default.yml
+++ b/conf/default.yml
@@ -1,62 +1,86 @@
+# General Configuration
 ability_refresh: 60
-api_key_blue: BLUEADMIN123
-api_key_red: ADMIN123
-app.contact.dns.domain: mycaldera.caldera
-app.contact.dns.socket: 0.0.0.0:8853
-app.contact.gist: API_KEY
-app.contact.html: /weather
-app.contact.http: http://0.0.0.0:8888
-app.contact.slack.api_key: SLACK_TOKEN
-app.contact.slack.bot_id: SLACK_BOT_ID
-app.contact.slack.channel_id: SLACK_CHANNEL_ID
-app.contact.tunnel.ssh.host_key_file: REPLACE_WITH_KEY_FILE_PATH
-app.contact.tunnel.ssh.host_key_passphrase: REPLACE_WITH_KEY_FILE_PASSPHRASE
-app.contact.tunnel.ssh.socket: 0.0.0.0:8022
-app.contact.tunnel.ssh.user_name: sandcat
-app.contact.tunnel.ssh.user_password: s4ndc4t!
-app.contact.ftp.host: 0.0.0.0
-app.contact.ftp.port: 2222
-app.contact.ftp.pword: caldera
-app.contact.ftp.server.dir: ftp_dir
-app.contact.ftp.user: caldera_user
-app.contact.tcp: 0.0.0.0:7010
-app.contact.udp: 0.0.0.0:7011
-app.contact.websocket: 0.0.0.0:7012
-objects.planners.default: atomic
 crypt_salt: REPLACE_WITH_RANDOM_VALUE
 encryption_key: ADMIN123
-exfil_dir: /tmp/caldera
-reachable_host_traits:
-- remote.host.fqdn
-- remote.host.ip
 host: 0.0.0.0
-plugins:
-- access
-- atomic
-- compass
-- debrief
-- fieldmanual
-- manx
-- response
-- sandcat
-- stockpile
-- training
 port: 8888
+exfil_dir: /tmp/caldera
 reports_dir: /tmp
-auth.login.handler.module: default
+objects:
+  planners:
+    default: atomic
+
+# User Authentication
+users:
+  blue:
+    blue: admin
+  red:
+    admin: admin
+    red: admin
+
+# Auth Module
+auth:
+  login:
+    handler:
+      module: default
+
+# Reachable Host Traits
+reachable_host_traits:
+  - remote.host.fqdn
+  - remote.host.ip
+
+# Application Contacts
+app:
+  contact:
+    dns:
+      domain: mycaldera.caldera
+      socket: 0.0.0.0:8853
+    gist: API_KEY
+    html: /weather
+    http: http://0.0.0.0:8888
+    tcp: 0.0.0.0:7010
+    udp: 0.0.0.0:7011
+    websocket: 0.0.0.0:7012
+    slack:
+      api_key: SLACK_TOKEN
+      bot_id: SLACK_BOT_ID
+      channel_id: SLACK_CHANNEL_ID
+    ftp:
+      host: 0.0.0.0
+      port: 2222
+      user: caldera_user
+      pword: caldera
+      server:
+        dir: ftp_dir
+    tunnel:
+      ssh:
+        socket: 0.0.0.0:8022
+        host_key_file: REPLACE_WITH_KEY_FILE_PATH
+        host_key_passphrase: REPLACE_WITH_KEY_FILE_PASSPHRASE
+        user_name: sandcat
+        user_password: s4ndc4t!
+
+# Plugin Configuration
+plugins:
+  - access
+  - atomic
+  - compass
+  - debrief
+  - fieldmanual
+  - manx
+  - response
+  - sandcat
+  - stockpile
+  - training
+
+# Requirements
 requirements:
   go:
-    command: go version
     type: installed_program
+    command: go version
     version: 1.19
   python:
-    attr: version
-    module: sys
     type: python_module
+    module: sys
+    attr: version
     version: 3.9.0
-users:
-  blue:
-    blue: admin
-  red:
-    admin: admin
-    red: admin