diff --git a/services/syncthing/H0615.nix b/services/syncthing/H0615.nix
index c11afdb8..5264e816 100644
--- a/services/syncthing/H0615.nix
+++ b/services/syncthing/H0615.nix
@@ -1,29 +1,21 @@
 {...}: {
-  imports = [./default.nix ./devices];
+  imports = [
+    ./default.nix
+    ./devices/Ion.nix
+    ./devices/Legion.nix
+    ./devices/Monarch.nix
+    ./devices/Northstar.nix
+    ./devices/Vanguard.nix
+    ./folders/notes.nix
+  ];
   services.syncthing = {
     user = "elitherl";
     group = "users";
     dataDir = "/home/elitherl";
-    extraOptions = {
-      options = {
-        globalAnnounceEnabled = true;
-        localAnnounceEnabled = true;
-      };
-    };
-    folders = {
-      "Notes" = {
-        path = "/home/elitherl/notes";
-        devices = ["ion" "monarch" "northstar" "vanguard"];
-        enable = true;
-      };
-      Sync = {
-        path = "/home/elitherl/Sync";
-        label = "UKAEA";
-        id = "fwzht-j7hrc";
-        devices = ["ion"];
-        ignorePerms = true;
-        enable = true;
-      };
+    extraOptions.options.globalAnnounceEnabled = true;
+    folders."Notes" = {
+      path = "~/notes";
+      devices = ["ion" "legion" "monarch" "northstar" "vanguard"];
     };
   };
 }