diff --git a/resources.toml b/resources.toml
index 441545e..bfcd428 100644
--- a/resources.toml
+++ b/resources.toml
@@ -6,10 +6,11 @@
 name = "demo-server"
 description = "Hosts demo.komo.do"
 tags = ["komodo", "demo"]
-config.address = "https://host.docker.internal:8120"
-config.region = "South-1"
-config.enabled = true
-config.mem_warning = 85.0
+[server.config]
+address = "https://host.docker.internal:8120"
+region = "South-1"
+enabled = true
+mem_warning = 85.0
 
 ##
 
@@ -17,10 +18,11 @@ config.mem_warning = 85.0
 name = "demo-sync"
 description = "Restores the config back to contents in demo-sync resources.toml"
 tags = ["komodo", "demo"]
-config.git_provider = "git.komo.do"
-config.repo = "mbecker20/demo-sync"
-config.resource_path = "resources.toml"
-config.delete = true
+[resource_sync.config]
+git_provider = "git.komo.do"
+repo = "mbecker20/demo-sync"
+resource_path = "resources.toml"
+delete = true
 
 ##################
 # Immich (Stack) #
@@ -31,8 +33,9 @@ name = "demo-immich"
 description = "See https://git.komo.do/mbecker20/demo-sync/src/branch/main/immich.compose.yaml"
 tags = ["demo", "immich"]
 deploy = true
-config.server_id = "demo-server"
-config.file_contents = """
+[stack.config]
+server_id = "demo-server"
+file_contents = """
 #
 # WARNING: Make sure to use the docker-compose.yml of the current release:
 #
@@ -106,7 +109,7 @@ services:
 volumes:
   model-cache:
 """
-config.environment = """
+environment = """
 	# Supports comments 🦎
 	UPLOAD_LOCATION = /immich/upload
 	DB_DATA_LOCATION = /immich/postgres # And end of line comments.
@@ -126,10 +129,11 @@ name = "demo-jellyfin"
 description = "See https://git.komo.do/mbecker20/demo-sync/src/branch/main/jellyfin.compose.yaml"
 tags = ["demo", "jellyfin"]
 deploy = true
-config.server_id = "demo-server"
-config.file_paths = ["jellyfin.compose.yaml"]
-config.git_provider = "git.komo.do"
-config.repo = "mbecker20/demo-sync"
+[stack.config]
+server_id = "demo-server"
+file_paths = ["jellyfin.compose.yaml"]
+git_provider = "git.komo.do"
+repo = "mbecker20/demo-sync"
 
 ##########################
 # Immich Deployer (Repo) #
@@ -139,11 +143,12 @@ config.repo = "mbecker20/demo-sync"
 name = "trigger-immich-deploy"
 description = "clone / pull to trigger immich stop, then deploy."
 tags = ["immich", "automation"]
-config.server_id = "demo-server"
-config.git_provider = "git.komo.do"
-config.repo = "mbecker20/demo-sync"
-config.on_pull.path = "."
-config.on_pull.command = "sh ./trigger-immich-deploy.sh"
+[repo.config]
+server_id = "demo-server"
+git_provider = "git.komo.do"
+repo = "mbecker20/demo-sync"
+on_pull.path = "."
+on_pull.command = "sh ./trigger-immich-deploy.sh"
 
 ###########
 # Logging #
@@ -154,15 +159,16 @@ name = "grafana-ui"
 description = "runs on port 3001"
 tags = ["logging", "ui"]
 deploy = true
-config.server_id = "demo-server"
-config.image.type = "Image"
-config.image.params.image = "grafana/grafana"
-config.restart = "unless-stopped"
-config.network = "bridge"
-config.ports = "3001 = 3000"
-config.extra_args = ["--add-host=host.docker.internal:host-gateway"] # so it can communicate with tempo at host.docker.internal
-config.volumes = "grafana-data = /var/lib/grafana"
-config.labels = "vector = key-value" # So vector picks up the logs, ships to loki
+[deployment.config]
+server_id = "demo-server"
+image.type = "Image"
+image.params.image = "grafana/grafana"
+restart = "unless-stopped"
+network = "bridge"
+ports = "3001 = 3000"
+extra_args = ["--add-host=host.docker.internal:host-gateway"] # so it can communicate with tempo at host.docker.internal
+volumes = "grafana-data = /var/lib/grafana"
+labels = "vector = key-value" # So vector picks up the logs, ships to loki
 
 ##
 
@@ -171,12 +177,13 @@ name = "loki-logging"
 description = "runs on 3100"
 tags = ["logging"]
 deploy = true
-config.server_id = "demo-server"
-config.image.type = "Image"
-config.image.params.image = "grafana/loki"
-config.restart = "unless-stopped"
-config.network = "host"
-config.volumes = "loki-data = /loki"
+[deployment.config]
+server_id = "demo-server"
+image.type = "Image"
+image.params.image = "grafana/loki"
+restart = "unless-stopped"
+network = "host"
+volumes = "loki-data = /loki"
 
 ##
 
@@ -185,11 +192,12 @@ name = "tempo-tracing"
 description = "OTLP: port 4317. HTTP: 3200. GRPC: 9096"
 tags = ["logging"]
 deploy = true
-config.server_id = "demo-server"
-config.file_paths = ["tempo.compose.yaml"]
-config.ignore_services = ["init"]
-config.git_provider = "git.komo.do"
-config.repo = "mbecker20/demo-sync"
+[stack.config]
+server_id = "demo-server"
+file_paths = ["tempo.compose.yaml"]
+ignore_services = ["init"]
+git_provider = "git.komo.do"
+repo = "mbecker20/demo-sync"
 
 ####################
 # Vector (Logging) #
@@ -200,11 +208,12 @@ config.repo = "mbecker20/demo-sync"
 # description = "Vector picks up logs from containers and ships them to central location"
 # tags = ["logging"]
 # deploy = true
-# config.server_id = "demo-server"
-# config.file_paths = ["compose.yaml"]
-# config.git_provider = "git.komo.do"
+# [stack.config]
+# server_id = "demo-server"
+# file_paths = ["compose.yaml"]
+# git_provider = "git.komo.do"
 #
-# config.repo = "mbecker20/demo-vector"
+# repo = "mbecker20/demo-vector"
 
 # [[repo]]
 
@@ -215,6 +224,7 @@ config.repo = "mbecker20/demo-sync"
 [[deployment]]
 name = "hello_world"
 tags = ["hello", "world"]
-config.server_id = "demo-server"
-config.image.type = "Image"
-config.image.params.image = "hello-world"
\ No newline at end of file
+[deployment.config]
+server_id = "demo-server"
+image.type = "Image"
+image.params.image = "hello-world"
\ No newline at end of file