diff --git a/configs/home-manager/foo-dogsquared/default.nix b/configs/home-manager/foo-dogsquared/default.nix
index c5a30fcb..eb5b3e18 100644
--- a/configs/home-manager/foo-dogsquared/default.nix
+++ b/configs/home-manager/foo-dogsquared/default.nix
@@ -20,7 +20,6 @@ in
       nixvim.enable = true;
       email.enable = true;
       email.thunderbird.enable = true;
-      research.enable = true;
       vs-code.enable = true;
 
       custom-homepage = {
@@ -49,6 +48,7 @@ in
       fonts.enable = true;
       music.enable = true;
       music.mpd.enable = true;
+      research.enable = true;
     };
   };
 
diff --git a/configs/home-manager/foo-dogsquared/modules/default.nix b/configs/home-manager/foo-dogsquared/modules/default.nix
index 62f9fad7..f632d003 100644
--- a/configs/home-manager/foo-dogsquared/modules/default.nix
+++ b/configs/home-manager/foo-dogsquared/modules/default.nix
@@ -12,7 +12,6 @@
     ./programs/keys.nix
     ./programs/nixvim
     ./programs/custom-homepage.nix
-    ./programs/research.nix
     ./programs/shell.nix
     ./programs/terminal-multiplexer.nix
     ./programs/vs-code.nix
@@ -21,5 +20,6 @@
     ./setups/development.nix
     ./setups/fonts.nix
     ./setups/music.nix
+    ./setups/research.nix
   ];
 }
diff --git a/configs/home-manager/foo-dogsquared/modules/programs/research.nix b/configs/home-manager/foo-dogsquared/modules/setups/research.nix
similarity index 95%
rename from configs/home-manager/foo-dogsquared/modules/programs/research.nix
rename to configs/home-manager/foo-dogsquared/modules/setups/research.nix
index a09f554e..d27a4ba1 100644
--- a/configs/home-manager/foo-dogsquared/modules/programs/research.nix
+++ b/configs/home-manager/foo-dogsquared/modules/setups/research.nix
@@ -2,10 +2,10 @@
 
 let
   userCfg = config.users.foo-dogsquared;
-  cfg = userCfg.programs.research;
+  cfg = userCfg.setups.research;
 in
 {
-  options.users.foo-dogsquared.programs.research.enable =
+  options.users.foo-dogsquared.setups.research.enable =
     lib.mkEnableOption "foo-dogsquared's usual toolbelt for research";
 
   config = lib.mkIf cfg.enable (lib.mkMerge [