diff --git a/modules/apps/default.nix b/modules/apps/default.nix
index 135e31f..d91cf11 100644
--- a/modules/apps/default.nix
+++ b/modules/apps/default.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ./rofi ./kitty.nix ./zathura.nix ./spotify.nix ./vscode.nix ];
+  imports = [ ./rofi ./kitty.nix ./zathura.nix ./spotify.nix ];
   home-manager.users.moritz.home.packages = with pkgs; [
     neofetch
     keepassxc
diff --git a/modules/default.nix b/modules/default.nix
index 5ef4f0c..93ae1cf 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,7 +1,7 @@
 { lib, pkgs, ... }:
 
 {
-  imports = [ ./apps ./cli ./desktop ./services ./cachix.nix ];
+  imports = [ ./apps ./cli ./desktop ./editors ./services ./cachix.nix ];
 
   # USERS
   users.users.moritz = {
diff --git a/modules/editors/default.nix b/modules/editors/default.nix
new file mode 100644
index 0000000..c816624
--- /dev/null
+++ b/modules/editors/default.nix
@@ -0,0 +1,5 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [ ./vim.nix ./emacs.nix ./vscode.nix ];
+}
diff --git a/modules/services/emacs/default.nix b/modules/editors/emacs.nix
similarity index 100%
rename from modules/services/emacs/default.nix
rename to modules/editors/emacs.nix
diff --git a/modules/editors/vim.nix b/modules/editors/vim.nix
new file mode 100644
index 0000000..91ab5f2
--- /dev/null
+++ b/modules/editors/vim.nix
@@ -0,0 +1,9 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home-manager.users.moritz.programs.neovim = {
+    enable = true;
+    vimAlias = true;
+    vimdiffAlias = true;
+  };
+}
diff --git a/modules/apps/vscode.nix b/modules/editors/vscode.nix
similarity index 100%
rename from modules/apps/vscode.nix
rename to modules/editors/vscode.nix
diff --git a/modules/services/default.nix b/modules/services/default.nix
index 55186da..7e5087f 100644
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ./dunst ./emacs ./agenix.nix ./diskstation ./picom.nix ];
+  imports = [ ./dunst ./agenix.nix ./diskstation ./picom.nix ];
 
   home-manager.users.moritz.services = { kdeconnect.enable = true; };