diff --git a/roles/gaming/default.nix b/roles/gaming/default.nix
old mode 100644
new mode 100755
index cccac83..dc70b10
--- a/roles/gaming/default.nix
+++ b/roles/gaming/default.nix
@@ -2,7 +2,8 @@
 
 {
 	imports = [
-		./programs
-		./services
+		./steam.nix
+		./mangohud.nix
+		./rpcs3.nix
 	];
 }
diff --git a/roles/gaming/programs/mangohud.nix b/roles/gaming/mangohud.nix
similarity index 100%
rename from roles/gaming/programs/mangohud.nix
rename to roles/gaming/mangohud.nix
diff --git a/roles/gaming/programs/default.nix b/roles/gaming/programs/default.nix
deleted file mode 100755
index dc70b10..0000000
--- a/roles/gaming/programs/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ ... }:
-
-{
-	imports = [
-		./steam.nix
-		./mangohud.nix
-		./rpcs3.nix
-	];
-}
diff --git a/roles/gaming/programs/rpcs3.nix b/roles/gaming/rpcs3.nix
similarity index 100%
rename from roles/gaming/programs/rpcs3.nix
rename to roles/gaming/rpcs3.nix
diff --git a/roles/gaming/services/default.nix b/roles/gaming/services/default.nix
deleted file mode 100644
index 69a706a..0000000
--- a/roles/gaming/services/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-
-{
-	imports = [
-		./syncthing.nix
-	];
-}
diff --git a/roles/gaming/services/syncthing.nix b/roles/gaming/services/syncthing.nix
deleted file mode 100644
index d275d88..0000000
--- a/roles/gaming/services/syncthing.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ config, ... }:
-
-{
-	/*
-	This file will sync saves for games that don't have cloud saves
-	TODO: turn this into a module eventually
-	*/
-
-	services.syncthing.folders = {
-		"steam-201810" = {
-			label = "Wolfenstein The New Order Saves";
-			id = "laxxf-t2wmy";
-			devices = [ "steamdeck" "server" "pc" ];
-			path = "~/.local/share/Steam/steamapps/compatdata/201810/pfx/drive_c/users/steamuser/Saved Games/MachineGames/Wolfenstein The New Order/";
-		};
-	};
-	home-manager.users.toast.home.file."steam-201810-ignore" = {
-		target = ".local/share/Steam/steamapps/compatdata/201810/pfx/drive_c/users/steamuser/Saved Games/MachineGames/Wolfenstein The New Order/.stignore";
-		text = "base/qconsole.log\nbase/wolfConfig.cfg";
-	};
-}
diff --git a/roles/gaming/programs/steam.nix b/roles/gaming/steam.nix
similarity index 100%
rename from roles/gaming/programs/steam.nix
rename to roles/gaming/steam.nix
diff --git a/roles/server/syncthing.nix b/roles/server/syncthing.nix
index 9c84f89..8e0cc71 100755
--- a/roles/server/syncthing.nix
+++ b/roles/server/syncthing.nix
@@ -18,15 +18,9 @@
 			"school-things" = {
 				label = "School things";
 				id = "z6alc-nfoqr";
-				devices = [ "steamdeck" "server" "pc"];
+				devices = [ "steamdeck" "server" ];
 				path = "${config.services.syncthing.dataDir}/school-things";
 			};
-			"steam-201810" = {
-				label = "Wolfenstein The New Order Saves";
-				id = "laxxf-t2wmy";
-				devices = [ "steamdeck" "server" "pc" ];
-				path = "${config.services.syncthing.dataDir}/steam-201810";
-			};
 		};
 	};
 	systemd.services.syncthing.serviceConfig = {