diff --git a/hosts/binto/configuration.nix b/hosts/binto/configuration.nix
index 7f63bdf5..4a6aec50 100644
--- a/hosts/binto/configuration.nix
+++ b/hosts/binto/configuration.nix
@@ -73,7 +73,7 @@
       imports = [
         ../../modules/alacritty.nix
         ../../modules/dconf.nix
-        ../../modules/firefox/main.nix
+        ../../modules/firefox
       ];
       programs.alacritty.settings.font.size = 10;
 
diff --git a/hosts/wim/home/main.nix b/hosts/wim/home/main.nix
index baea6bfc..5d404d5a 100644
--- a/hosts/wim/home/main.nix
+++ b/hosts/wim/home/main.nix
@@ -16,12 +16,13 @@
       imports = [
         ./theme.nix
         ./hyprland.nix
-        ./dotfiles.nix
+        ../modules/dotfiles.nix
         ./packages.nix
 
         ../../../modules/alacritty.nix
         ../../../modules/dconf.nix
-        ../../../modules/firefox/main.nix
+        ../../../modules/firefox
+        ../../../modules/wofi
       ];
 
       home.stateVersion = "23.05";
diff --git a/hosts/wim/home/dotfiles.nix b/hosts/wim/modules/dotfiles.nix
similarity index 70%
rename from hosts/wim/home/dotfiles.nix
rename to hosts/wim/modules/dotfiles.nix
index 2dcac6a5..dcca048f 100644
--- a/hosts/wim/home/dotfiles.nix
+++ b/hosts/wim/modules/dotfiles.nix
@@ -1,6 +1,4 @@
-{ config, pkgs, nixpkgs-wayland, ... }: let
-  waypkgs = nixpkgs-wayland.packages.x86_64-linux;
-
+{ config, pkgs, ... }: let
   configDir = (import ../vars.nix).configDir;
   symlink = config.lib.file.mkOutOfStoreSymlink;
 in
@@ -26,21 +24,4 @@ in
     "neofetch".source              = symlink "${configDir}/neofetch";
     "swappy".source                = symlink "${configDir}/swappy";
   };
-
-  programs = {
-    wofi = {
-      enable = true;
-      package = waypkgs.wofi;
-      settings = {
-        prompt = "";
-        allow_images = true;
-        normal_window = true;
-        image_size = "48";
-        matching = "fuzzy";
-        insensitive = true;
-        no_actions = true;
-      };
-      style = builtins.readFile ../config/wofi/style.css;
-    };
-  };
 }
diff --git a/modules/firefox/main.nix b/modules/firefox/default.nix
similarity index 100%
rename from modules/firefox/main.nix
rename to modules/firefox/default.nix
diff --git a/modules/wofi/default.nix b/modules/wofi/default.nix
new file mode 100644
index 00000000..b9531357
--- /dev/null
+++ b/modules/wofi/default.nix
@@ -0,0 +1,20 @@
+# Home-manager module
+
+{ nixpkgs-wayland, ... }: {
+  programs = {
+    wofi = {
+      enable = true;
+      package = nixpkgs-wayland.packages.x86_64-linux.wofi;
+      settings = {
+        prompt = "";
+        allow_images = true;
+        normal_window = true;
+        image_size = "48";
+        matching = "fuzzy";
+        insensitive = true;
+        no_actions = true;
+      };
+      style = builtins.readFile ./style.css;
+    };
+  };
+}
diff --git a/hosts/wim/config/wofi/style.css b/modules/wofi/style.css
similarity index 100%
rename from hosts/wim/config/wofi/style.css
rename to modules/wofi/style.css