diff --git a/modules/autopairs/default.nix b/modules/autopairs/default.nix
index 3e85003..742665c 100644
--- a/modules/autopairs/default.nix
+++ b/modules/autopairs/default.nix
@@ -1,43 +1,5 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-with lib;
-with builtins; let
-  cfg = config.vim.autopairs;
-in {
-  options.vim = {
-    autopairs = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = "enable autopairs";
-      };
-
-      type = mkOption {
-        type = types.enum ["nvim-autopairs"];
-        default = "nvim-autopairs";
-        description = "Set the autopairs type. Options: nvim-autopairs [nvim-autopairs]";
-      };
-    };
-  };
-
-  config =
-    mkIf cfg.enable
-    {
-      vim.startPlugins = ["nvim-autopairs"];
-
-      vim.luaConfigRC.autopairs = nvim.dag.entryAnywhere ''
-        require("nvim-autopairs").setup{}
-        ${optionalString (config.vim.autocomplete.type == "nvim-compe") ''
-          require('nvim-autopairs.completion.compe').setup({
-            map_cr = true,
-            map_complete = true,
-            auto_select = false,
-          })
-        ''}
-      '';
-    };
+_: {
+  imports = [
+    ./nvim-autopairs
+  ];
 }
diff --git a/modules/autopairs/nvim-autopairs/config.nix b/modules/autopairs/nvim-autopairs/config.nix
new file mode 100644
index 0000000..87903ef
--- /dev/null
+++ b/modules/autopairs/nvim-autopairs/config.nix
@@ -0,0 +1,27 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.autopairs;
+in {
+  config =
+    mkIf (cfg.enable)
+    {
+      vim.startPlugins = ["nvim-autopairs"];
+
+      vim.luaConfigRC.autopairs = nvim.dag.entryAnywhere ''
+        require("nvim-autopairs").setup{}
+        ${optionalString (config.vim.autocomplete.type == "nvim-compe") ''
+          require('nvim-autopairs.completion.compe').setup({
+            map_cr = ${boolToString cfg.nvim-compe.map_cr},
+            map_complete = ${boolToString cfg.nvim-compe.map_complete},
+            auto_select = ${boolToString cfg.nvim-compe.auto_select},
+          })
+        ''}
+      '';
+    };
+}
diff --git a/modules/autopairs/nvim-autopairs/default.nix b/modules/autopairs/nvim-autopairs/default.nix
new file mode 100644
index 0000000..f228331
--- /dev/null
+++ b/modules/autopairs/nvim-autopairs/default.nix
@@ -0,0 +1,6 @@
+_: {
+  imports = [
+    ./config.nix
+    ./nvim-autopairs.nix
+  ];
+}
diff --git a/modules/autopairs/nvim-autopairs/nvim-autopairs.nix b/modules/autopairs/nvim-autopairs/nvim-autopairs.nix
new file mode 100644
index 0000000..402561e
--- /dev/null
+++ b/modules/autopairs/nvim-autopairs/nvim-autopairs.nix
@@ -0,0 +1,46 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.autopairs;
+in {
+  options.vim = {
+    autopairs = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "enable autopairs";
+      };
+
+      type = mkOption {
+        type = types.enum ["nvim-autopairs"];
+        default = "nvim-autopairs";
+        description = "Set the autopairs type. Options: nvim-autopairs [nvim-autopairs]";
+      };
+
+      nvim-compe = {
+        map_cr = mkOption {
+          type = types.bool;
+          default = true;
+          description = "map <CR> on insert mode";
+        };
+
+        map_complete = mkOption {
+          type = types.bool;
+          default = true;
+          description = "auto insert `(` after select function or method item";
+        };
+
+        auto_select = mkOption {
+          type = types.bool;
+          default = false;
+          description = "auto select first item";
+        };
+      };
+    };
+  };
+}
diff --git a/modules/basic/config.nix b/modules/basic/config.nix
new file mode 100644
index 0000000..3c34cf2
--- /dev/null
+++ b/modules/basic/config.nix
@@ -0,0 +1,103 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim;
+in {
+  config = {
+    vim.startPlugins = ["plenary-nvim"];
+
+    vim.nmap = mkIf cfg.disableArrows {
+      "<up>" = "<nop>";
+      "<down>" = "<nop>";
+      "<left>" = "<nop>";
+      "<right>" = "<nop>";
+    };
+
+    vim.imap = mkIf cfg.disableArrows {
+      "<up>" = "<nop>";
+      "<down>" = "<nop>";
+      "<left>" = "<nop>";
+      "<right>" = "<nop>";
+    };
+
+    vim.nnoremap = mkIf cfg.mapLeaderSpace {"<space>" = "<nop>";};
+
+    vim.configRC.basic = nvim.dag.entryAfter ["globalsScript"] ''
+      " Settings that are set for everything
+      set encoding=utf-8
+      set mouse=${cfg.mouseSupport}
+      set tabstop=${toString cfg.tabWidth}
+      set shiftwidth=${toString cfg.tabWidth}
+      set softtabstop=${toString cfg.tabWidth}
+      set expandtab
+      set cmdheight=${toString cfg.cmdHeight}
+      set updatetime=${toString cfg.updateTime}
+      set shortmess+=c
+      set tm=${toString cfg.mapTimeout}
+      set hidden
+      ${optionalString cfg.splitBelow ''
+        set splitbelow
+      ''}
+      ${optionalString cfg.splitRight ''
+        set splitright
+      ''}
+      ${optionalString cfg.showSignColumn ''
+        set signcolumn=yes
+      ''}
+      ${optionalString cfg.autoIndent ''
+        set autoindent
+      ''}
+
+      ${optionalString cfg.preventJunkFiles ''
+        set noswapfile
+        set nobackup
+        set nowritebackup
+      ''}
+      ${optionalString (cfg.bell == "none") ''
+        set noerrorbells
+        set novisualbell
+      ''}
+      ${optionalString (cfg.bell == "on") ''
+        set novisualbell
+      ''}
+      ${optionalString (cfg.bell == "visual") ''
+        set noerrorbells
+      ''}
+      ${optionalString (cfg.lineNumberMode == "relative") ''
+        set relativenumber
+      ''}
+      ${optionalString (cfg.lineNumberMode == "number") ''
+        set number
+      ''}
+      ${optionalString (cfg.lineNumberMode == "relNumber") ''
+        set number relativenumber
+      ''}
+      ${optionalString cfg.useSystemClipboard ''
+        set clipboard+=unnamedplus
+      ''}
+      ${optionalString cfg.mapLeaderSpace ''
+        let mapleader=" "
+        let maplocalleader=" "
+      ''}
+      ${optionalString cfg.syntaxHighlighting ''
+        syntax on
+      ''}
+      ${optionalString (!cfg.wordWrap) ''
+        set nowrap
+      ''}
+      ${optionalString cfg.hideSearchHighlight ''
+        set nohlsearch
+        set incsearch
+      ''}
+      ${optionalString cfg.colourTerm ''
+        set termguicolors
+        set t_Co=256
+      ''}
+    '';
+  };
+}
diff --git a/modules/basic/default.nix b/modules/basic/default.nix
index f020608..a883939 100644
--- a/modules/basic/default.nix
+++ b/modules/basic/default.nix
@@ -1,225 +1,6 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-with lib;
-with builtins; let
-  cfg = config.vim;
-in {
-  options.vim = {
-    colourTerm = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Set terminal up for 256 colours";
-    };
-
-    disableArrows = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Set to prevent arrow keys from moving cursor";
-    };
-
-    hideSearchHighlight = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Hide search highlight so it doesn't stay highlighted";
-    };
-
-    scrollOffset = mkOption {
-      type = types.int;
-      default = 8;
-      description = "Start scrolling this number of lines from the top or bottom of the page.";
-    };
-
-    wordWrap = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Enable word wrapping.";
-    };
-
-    syntaxHighlighting = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Enable syntax highlighting";
-    };
-
-    mapLeaderSpace = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Map the space key to leader key";
-    };
-
-    useSystemClipboard = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Make use of the clipboard for default yank and paste operations. Don't use * and +";
-    };
-
-    mouseSupport = mkOption {
-      type = with types; enum ["a" "n" "v" "i" "c"];
-      default = "a";
-      description = "Set modes for mouse support. a - all, n - normal, v - visual, i - insert, c - command";
-    };
-
-    lineNumberMode = mkOption {
-      type = with types; enum ["relative" "number" "relNumber" "none"];
-      default = "relNumber";
-      description = "How line numbers are displayed. none, relative, number, relNumber";
-    };
-
-    preventJunkFiles = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Prevent swapfile, backupfile from being created";
-    };
-
-    tabWidth = mkOption {
-      type = types.int;
-      default = 4;
-      description = "Set the width of tabs";
-    };
-
-    autoIndent = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Enable auto indent";
-    };
-
-    cmdHeight = mkOption {
-      type = types.int;
-      default = 1;
-      description = "Height of the command pane";
-    };
-
-    updateTime = mkOption {
-      type = types.int;
-      default = 300;
-      description = "The number of milliseconds till Cursor Hold event is fired";
-    };
-
-    showSignColumn = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Show the sign column";
-    };
-
-    bell = mkOption {
-      type = types.enum ["none" "visual" "on"];
-      default = "none";
-      description = "Set how bells are handled. Options: on, visual or none";
-    };
-
-    mapTimeout = mkOption {
-      type = types.int;
-      default = 500;
-      description = "Timeout in ms that neovim will wait for mapped action to complete";
-    };
-
-    splitBelow = mkOption {
-      type = types.bool;
-      default = true;
-      description = "New splits will open below instead of on top";
-    };
-
-    splitRight = mkOption {
-      type = types.bool;
-      default = true;
-      description = "New splits will open to the right";
-    };
-  };
-
-  config = {
-    vim.startPlugins = ["plenary-nvim"];
-
-    vim.nmap = mkIf cfg.disableArrows {
-      "<up>" = "<nop>";
-      "<down>" = "<nop>";
-      "<left>" = "<nop>";
-      "<right>" = "<nop>";
-    };
-
-    vim.imap = mkIf cfg.disableArrows {
-      "<up>" = "<nop>";
-      "<down>" = "<nop>";
-      "<left>" = "<nop>";
-      "<right>" = "<nop>";
-    };
-
-    vim.nnoremap = mkIf cfg.mapLeaderSpace {"<space>" = "<nop>";};
-
-    vim.configRC.basic = nvim.dag.entryAfter ["globalsScript"] ''
-      " Settings that are set for everything
-      set encoding=utf-8
-      set mouse=${cfg.mouseSupport}
-      set tabstop=${toString cfg.tabWidth}
-      set shiftwidth=${toString cfg.tabWidth}
-      set softtabstop=${toString cfg.tabWidth}
-      set expandtab
-      set cmdheight=${toString cfg.cmdHeight}
-      set updatetime=${toString cfg.updateTime}
-      set shortmess+=c
-      set tm=${toString cfg.mapTimeout}
-      set hidden
-      ${optionalString cfg.splitBelow ''
-        set splitbelow
-      ''}
-      ${optionalString cfg.splitRight ''
-        set splitright
-      ''}
-      ${optionalString cfg.showSignColumn ''
-        set signcolumn=yes
-      ''}
-      ${optionalString cfg.autoIndent ''
-        set autoindent
-      ''}
-
-      ${optionalString cfg.preventJunkFiles ''
-        set noswapfile
-        set nobackup
-        set nowritebackup
-      ''}
-      ${optionalString (cfg.bell == "none") ''
-        set noerrorbells
-        set novisualbell
-      ''}
-      ${optionalString (cfg.bell == "on") ''
-        set novisualbell
-      ''}
-      ${optionalString (cfg.bell == "visual") ''
-        set noerrorbells
-      ''}
-      ${optionalString (cfg.lineNumberMode == "relative") ''
-        set relativenumber
-      ''}
-      ${optionalString (cfg.lineNumberMode == "number") ''
-        set number
-      ''}
-      ${optionalString (cfg.lineNumberMode == "relNumber") ''
-        set number relativenumber
-      ''}
-      ${optionalString cfg.useSystemClipboard ''
-        set clipboard+=unnamedplus
-      ''}
-      ${optionalString cfg.mapLeaderSpace ''
-        let mapleader=" "
-        let maplocalleader=" "
-      ''}
-      ${optionalString cfg.syntaxHighlighting ''
-        syntax on
-      ''}
-      ${optionalString (!cfg.wordWrap) ''
-        set nowrap
-      ''}
-      ${optionalString cfg.hideSearchHighlight ''
-        set nohlsearch
-        set incsearch
-      ''}
-      ${optionalString cfg.colourTerm ''
-        set termguicolors
-        set t_Co=256
-      ''}
-    '';
-  };
+_: {
+  imports = [
+    ./config.nix
+    ./module.nix
+  ];
 }
diff --git a/modules/basic/module.nix b/modules/basic/module.nix
new file mode 100644
index 0000000..e1f5dff
--- /dev/null
+++ b/modules/basic/module.nix
@@ -0,0 +1,132 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim;
+in {
+  options.vim = {
+    colourTerm = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Set terminal up for 256 colours";
+    };
+
+    disableArrows = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Set to prevent arrow keys from moving cursor";
+    };
+
+    hideSearchHighlight = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Hide search highlight so it doesn't stay highlighted";
+    };
+
+    scrollOffset = mkOption {
+      type = types.int;
+      default = 8;
+      description = "Start scrolling this number of lines from the top or bottom of the page.";
+    };
+
+    wordWrap = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Enable word wrapping.";
+    };
+
+    syntaxHighlighting = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Enable syntax highlighting";
+    };
+
+    mapLeaderSpace = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Map the space key to leader key";
+    };
+
+    useSystemClipboard = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Make use of the clipboard for default yank and paste operations. Don't use * and +";
+    };
+
+    mouseSupport = mkOption {
+      type = with types; enum ["a" "n" "v" "i" "c"];
+      default = "a";
+      description = "Set modes for mouse support. a - all, n - normal, v - visual, i - insert, c - command";
+    };
+
+    lineNumberMode = mkOption {
+      type = with types; enum ["relative" "number" "relNumber" "none"];
+      default = "relNumber";
+      description = "How line numbers are displayed. none, relative, number, relNumber";
+    };
+
+    preventJunkFiles = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Prevent swapfile, backupfile from being created";
+    };
+
+    tabWidth = mkOption {
+      type = types.int;
+      default = 4;
+      description = "Set the width of tabs";
+    };
+
+    autoIndent = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Enable auto indent";
+    };
+
+    cmdHeight = mkOption {
+      type = types.int;
+      default = 1;
+      description = "Height of the command pane";
+    };
+
+    updateTime = mkOption {
+      type = types.int;
+      default = 300;
+      description = "The number of milliseconds till Cursor Hold event is fired";
+    };
+
+    showSignColumn = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Show the sign column";
+    };
+
+    bell = mkOption {
+      type = types.enum ["none" "visual" "on"];
+      default = "none";
+      description = "Set how bells are handled. Options: on, visual or none";
+    };
+
+    mapTimeout = mkOption {
+      type = types.int;
+      default = 500;
+      description = "Timeout in ms that neovim will wait for mapped action to complete";
+    };
+
+    splitBelow = mkOption {
+      type = types.bool;
+      default = true;
+      description = "New splits will open below instead of on top";
+    };
+
+    splitRight = mkOption {
+      type = types.bool;
+      default = true;
+      description = "New splits will open to the right";
+    };
+  };
+}
diff --git a/modules/comments/default.nix b/modules/comments/default.nix
index 8efe564..138ad80 100644
--- a/modules/comments/default.nix
+++ b/modules/comments/default.nix
@@ -1,6 +1,6 @@
 _: {
   imports = [
-    ./comment-nvim.nix
-    ./kommentary.nix
+    ./comment-nvim
+    ./kommentary.nix # WARNING: WILL BE REMOVED IN THE NEXT MAJOR RELEASE
   ];
 }