diff --git a/flake.nix b/flake.nix
index 606d593..4949d5d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,16 +16,16 @@
         greynix = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
-          ./nixosModules/base.nix
+          ./mods/base.nix
           ./greynix/configuration.nix
-          ./nixosModules/docker.nix
+          ./mods/docker.nix
           nvf.nixosModules.default #for neovim framework flake
           
           home-manager.nixosModules.home-manager
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
-            home-manager.users.elias = import ./nixosModules/home.nix;
+            home-manager.users.elias = import ./mods/home.nix;
 
             # Optionally, use home-manager.extraSpecialArgs to pass
             # arguments to home.nix
diff --git a/nixosModules/base.nix b/mods/base.nix
similarity index 100%
rename from nixosModules/base.nix
rename to mods/base.nix
diff --git a/nixosModules/docker.nix b/mods/docker.nix
similarity index 100%
rename from nixosModules/docker.nix
rename to mods/docker.nix
diff --git a/nixosModules/fonts.nix b/mods/fonts.nix
similarity index 100%
rename from nixosModules/fonts.nix
rename to mods/fonts.nix
diff --git a/nixosModules/gnome.nix b/mods/gnome.nix
similarity index 100%
rename from nixosModules/gnome.nix
rename to mods/gnome.nix
diff --git a/nixosModules/home.nix b/mods/home.nix
similarity index 100%
rename from nixosModules/home.nix
rename to mods/home.nix
diff --git a/nixosModules/intel-gpu.nix b/mods/intel-gpu.nix
similarity index 100%
rename from nixosModules/intel-gpu.nix
rename to mods/intel-gpu.nix
diff --git a/mods/neovim-config.nix b/mods/neovim-config.nix
new file mode 100644
index 0000000..2a7d270
--- /dev/null
+++ b/mods/neovim-config.nix
@@ -0,0 +1,30 @@
+{ pkgs, lib, ... }:
+
+{
+  # neovim setup with NVF
+  # https://github.com/NotAShelf/nvf
+  programs.nvf = {
+    enable = true;
+
+    settings.vim = {
+        theme = {
+          enable = true;
+          name = "gruvbox";
+          style = "dark";
+        };
+    statusLine.lualine.enable = true;
+    telescope.enable = true;
+    autocomplete.nvim-cmp.enable = true;
+    
+    languages = {
+      enableLSP = true;
+      enableTreesitter = true;
+      
+      nix.enable = true;
+      ts.enable = true;
+      rust.enable = true;
+      };
+    };
+  };
+
+}
diff --git a/nixosModules/systemd.nix b/mods/systemd.nix
similarity index 100%
rename from nixosModules/systemd.nix
rename to mods/systemd.nix
diff --git a/nixosModules/neovim-config.nix b/nixosModules/neovim-config.nix
deleted file mode 100644
index 5648ec6..0000000
--- a/nixosModules/neovim-config.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ pkgs, lib, ... }:
-
-{
-  # neovim setup with NVF
-  # https://github.com/NotAShelf/nvf
-  programs.nvf = {
-    vim = {
-      theme = {
-        enable = true;
-        name = "gruvbox";
-        style = "dark";
-      };
-      statusLine.lualine.enable = true;
-      telescope.enable = true;
-      autocomplete.nvim-cmp.enable = true;
-    
-      languages = {
-        enableLSP = true;
-        enableTreesitter = true;
-      
-        nix.enable = true;
-        ts.enable = true;
-        rust.enable = true;
-      };
-    };
-  };
-
-}