diff --git a/modules/minimap/codewindow/codewindow.nix b/modules/minimap/codewindow/codewindow.nix
new file mode 100644
index 0000000..629a478
--- /dev/null
+++ b/modules/minimap/codewindow/codewindow.nix
@@ -0,0 +1,14 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.minimap.codewindow;
+in {
+  options.vim.minimap.codewindow = {
+    enable = mkEnableOption "Enable minimap-vim plugin";
+  };
+}
diff --git a/modules/minimap/codewindow.nix b/modules/minimap/codewindow/config.nix
similarity index 81%
rename from modules/minimap/codewindow.nix
rename to modules/minimap/codewindow/config.nix
index 099bc6d..c3f7dd5 100644
--- a/modules/minimap/codewindow.nix
+++ b/modules/minimap/codewindow/config.nix
@@ -8,10 +8,6 @@ with lib;
 with builtins; let
   cfg = config.vim.minimap.codewindow;
 in {
-  options.vim.minimap.codewindow = {
-    enable = mkEnableOption "Enable minimap-vim plugin";
-  };
-
   config = mkIf cfg.enable {
     vim.startPlugins = [
       "codewindow-nvim"
diff --git a/modules/minimap/codewindow/default.nix b/modules/minimap/codewindow/default.nix
new file mode 100644
index 0000000..f3f8a9a
--- /dev/null
+++ b/modules/minimap/codewindow/default.nix
@@ -0,0 +1,6 @@
+_: {
+  imports = [
+    ./codewindow.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/minimap/default.nix b/modules/minimap/default.nix
index 0007404..5222d6d 100644
--- a/modules/minimap/default.nix
+++ b/modules/minimap/default.nix
@@ -5,7 +5,7 @@
   ...
 }: {
   imports = [
-    ./minimap-vim.nix
-    ./codewindow.nix
+    ./minimap-vim
+    ./codewindow
   ];
 }
diff --git a/modules/minimap/minimap-vim.nix b/modules/minimap/minimap-vim/config.nix
similarity index 68%
rename from modules/minimap/minimap-vim.nix
rename to modules/minimap/minimap-vim/config.nix
index f2f9609..15f1761 100644
--- a/modules/minimap/minimap-vim.nix
+++ b/modules/minimap/minimap-vim/config.nix
@@ -8,10 +8,6 @@ with lib;
 with builtins; let
   cfg = config.vim.minimap.minimap-vim;
 in {
-  options.vim.minimap.minimap-vim = {
-    enable = mkEnableOption "Enable minimap-vim plugin";
-  };
-
   config = mkIf cfg.enable {
     vim.startPlugins = [
       pkgs.code-minimap
diff --git a/modules/minimap/minimap-vim/default.nix b/modules/minimap/minimap-vim/default.nix
new file mode 100644
index 0000000..889184e
--- /dev/null
+++ b/modules/minimap/minimap-vim/default.nix
@@ -0,0 +1,6 @@
+_: {
+  imports = [
+    ./minimap-vim.nix
+    ./config.nix
+  ];
+}
diff --git a/modules/minimap/minimap-vim/minimap-vim.nix b/modules/minimap/minimap-vim/minimap-vim.nix
new file mode 100644
index 0000000..54fea92
--- /dev/null
+++ b/modules/minimap/minimap-vim/minimap-vim.nix
@@ -0,0 +1,14 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.minimap.minimap-vim;
+in {
+  options.vim.minimap.minimap-vim = {
+    enable = mkEnableOption "Enable minimap-vim plugin";
+  };
+}