diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua
index 1994d04..70bd50f 100644
--- a/lua/plugins/cmp.lua
+++ b/lua/plugins/cmp.lua
@@ -4,16 +4,7 @@ return {
     { 'onsails/lspkind-nvim' },
     { 'hrsh7th/cmp-buffer' },
     { 'hrsh7th/cmp-nvim-lsp' },
-    {
-      'L3MON4D3/LuaSnip',
-      config = function()
-        require('setup/luasnip')
-      end,
-      dependencies =
-      {
-        'rafamadriz/friendly-snippets'
-      }
-    },
+    { 'L3MON4D3/LuaSnip' },
     { 'saadparwaiz1/cmp_luasnip' },
     { 'hrsh7th/cmp-nvim-lua' },
     { 'octaltree/cmp-look' },
diff --git a/lua/plugins/dap.lua b/lua/plugins/dap.lua
index b62079e..dbf6fad 100644
--- a/lua/plugins/dap.lua
+++ b/lua/plugins/dap.lua
@@ -118,14 +118,13 @@ return {
     function loadConfigs()
       require('dap.ext.vscode').load_launchjs()
       -- Make sure we use the correct python env even for the configs from launch.json
-      for nr, config in pairs(dap.configurations.python) do
+      for _, config in pairs(dap.configurations.python) do
         config.pythonPath = getPythonEnv()
         config.cwd = vim.fn.getcwd()
       end
       require 'telescope'.extensions.dap.configurations {}
     end
 
-    local initDir = vim.api.nvim_list_runtime_paths()[1]
     local masonpath = vim.fn.stdpath('data') .. '/mason'
 
     -- PYTHON
@@ -138,17 +137,16 @@ return {
       };
     }
 
-    local dap = require("dap")
     local dapui = require("dapui")
     dapui.setup()
     dap.listeners.after.event_initialized["dapui_config"] = function()
-      dapui.open()
+      dapui.open({})
     end
     dap.listeners.before.event_terminated["dapui_config"] = function()
-      dapui.close()
+      dapui.close({})
     end
     dap.listeners.before.event_exited["dapui_config"] = function()
-      dapui.close()
+      dapui.close({})
     end
 
     dap.configurations.python = {
@@ -242,7 +240,7 @@ return {
 
     -- EXTENSIONS
 
-    require('nvim-dap-virtual-text').setup()
+    require('nvim-dap-virtual-text').setup({})
     require('telescope').load_extension('dap')
 
   end,
diff --git a/lua/plugins/diffview.lua b/lua/plugins/diffview.lua
new file mode 100644
index 0000000..6fd92bf
--- /dev/null
+++ b/lua/plugins/diffview.lua
@@ -0,0 +1,8 @@
+return {
+  'sindrets/diffview.nvim',
+  dependencies = {
+    'nvim-lua/plenary.nvim'
+  },
+  config = true,
+  cmd = 'DiffviewOpen',
+}
diff --git a/lua/plugins/gruvbox_flat.lua b/lua/plugins/gruvbox_flat.lua
new file mode 100644
index 0000000..f3603d2
--- /dev/null
+++ b/lua/plugins/gruvbox_flat.lua
@@ -0,0 +1,18 @@
+return {
+  'eddyekofo94/gruvbox-flat.nvim',
+  priority = 1000,
+  config = function()
+    local colors = require('gruvbox.colors')
+    vim.g.gruvbox_flat_style = "dark"
+    vim.g.gruvbox_colors = {
+      bg_search = 'purple',
+      fg_search = 'black',
+    }
+    vim.g.gruvbox_theme = {
+      Pmenu = { bg = 'bg_visual' },
+      NormalFloat = { bg = 'bg_visual' }
+    }
+    vim.g.gruvbox_dark_float = false
+    vim.cmd('colorscheme gruvbox-flat')
+  end
+}
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index 882f71e..058678e 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -1,49 +1,2 @@
 return {
-  {
-    'mrjones2014/legendary.nvim',
-    config = function()
-      require('setup/my_legendary')
-      require('legendary').keymaps(
-        {
-          {
-            '<leader>i',
-            function()
-              require("lazy").home()
-            end,
-            description = 'Start lazy home'
-          }
-        }
-      )
-    end,
-    dependencies = {
-      'stevearc/dressing.nvim',
-      'nvim-telescope/telescope.nvim',
-    },
-    keys = { '<leader>p', '<leader>i' }
-  },
-  {
-    'eddyekofo94/gruvbox-flat.nvim',
-    disable = false,
-    priority = 1000,
-    config = function()
-      require('setup/my_gruvbox_flat')
-    end
-  },
-  {
-    'sindrets/diffview.nvim',
-    dependencies = 'nvim-lua/plenary.nvim',
-    config = function()
-      require('setup/my_diffview')
-    end,
-    cmd = 'DiffviewOpen',
-  },
-  {
-    'stevearc/overseer.nvim',
-    config = function()
-      require('setup/my_overseer')
-    end,
-    keys = {
-      { '<F4>' }
-    },
-  }
 }
diff --git a/lua/plugins/luasnip.lua b/lua/plugins/luasnip.lua
new file mode 100644
index 0000000..e11aa7f
--- /dev/null
+++ b/lua/plugins/luasnip.lua
@@ -0,0 +1,66 @@
+return {
+  'L3MON4D3/LuaSnip',
+  config = function()
+    local ls = require('luasnip')
+    -- some shorthands...
+    local s = ls.snippet
+    local sn = ls.snippet_node
+    local isn = ls.indent_snippet_node
+    local t = ls.text_node
+    local i = ls.insert_node
+    local f = ls.function_node
+    local c = ls.choice_node
+    local d = ls.dynamic_node
+    local r = ls.restore_node
+    local l = require('luasnip.extras').lambda
+    local rep = require('luasnip.extras').rep
+    local p = require('luasnip.extras').partial
+    local m = require('luasnip.extras').match
+    local n = require('luasnip.extras').nonempty
+    local dl = require('luasnip.extras').dynamic_lambda
+    local fmt = require('luasnip.extras.fmt').fmt
+    local fmta = require('luasnip.extras.fmt').fmta
+    local types = require('luasnip.util.types')
+    local conds = require('luasnip.extras.expand_conditions')
+
+    local function getRegA(capitalize)
+      local clipboard = vim.fn.getreg('a')
+      clipboard = clipboard:gsub('^m_', '')
+      if capitalize then
+        clipboard = clipboard:gsub('^%l', string.upper)
+      end
+      return clipboard
+    end
+
+    ls.snippets = {
+      cpp = {
+        s('TEST_F_getset',
+          {
+            t('TEST_F('), i(1, 'TestClass'), t(' ,test_'), p(getRegA, false), t({ '_set_get)', '{', '  ' }),
+            i(2, 'm_object'), t('.set'), p(getRegA, true), t('('), i(3, '32.F'), t({ ');', '  ' }),
+            i(4, 'EXPECT_EQ('), rep(3), t(', '), rep(2), t('.get'), p(getRegA, true), t({ '());', '' }),
+            t({ '', '}', '' })
+          }),
+        s('TEST_fn_getset',
+          {
+            t('void '), p(getRegA, false), t('_'), i(1, 'get'), t('_'), i(2, 'set'), t({ '()', '{', '  ' }),
+            i(3, 'm_object'), t('.set'), p(getRegA, true), t('('), i(4, '32.F'), t({ ');', '  ' }),
+            i(5, 'EXPECT_EQ('), rep(4), t(', '), rep(3), t('.get'), p(getRegA, true), t({ '());', '' }),
+            t({ '', '}', '', '' }),
+
+            t('TEST_F('), i(5), t(' ,test_'), p(getRegA, false), t({ '_set_get)', '{', '  ' }),
+            p(getRegA, false), t('_'), rep(1), t('_'), rep(2), t({ '();' }),
+            t({ '', '}' }),
+          })
+      },
+    }
+
+    require('luasnip.loaders.from_vscode').lazy_load()
+    require('luasnip.loaders.from_vscode').lazy_load({ paths = { "./my-snippets" } })
+  end,
+  dependencies =
+  {
+    'rafamadriz/friendly-snippets'
+  },
+  cmd = 'LuaSnipListAvailable'
+}
diff --git a/lua/plugins/neogen.lua b/lua/plugins/neogen.lua
new file mode 100644
index 0000000..4937074
--- /dev/null
+++ b/lua/plugins/neogen.lua
@@ -0,0 +1,34 @@
+return {
+  'danymat/neogen',
+  dependencies = 'nvim-treesitter/nvim-treesitter',
+  config = {
+    enabled = true,
+    languages = {
+      cpp = {
+        template = {
+          annotation_convention = 'custom',
+          custom = {
+            { nil, '/// file', { no_results = true, type = { 'file' } } },
+            { nil, '/// $1', { no_results = true, type = { 'func', 'file' } } },
+            { nil, '', { no_results = true, type = { 'file' } } },
+
+            { nil, '/// $1', { type = { 'func' } } },
+            { 'tparam', '/// \\tparam %s $1' },
+            { 'parameters', '/// \\param %s $1' },
+            { 'return_statement', '/// \\return $1' },
+          },
+        },
+      },
+    },
+  },
+  keys = {
+    {
+      '<leader>n',
+      function()
+        require('neogen').generate()
+      end,
+      desc = 'Add comment',
+    }
+  },
+  cmd = 'Neogen'
+}
diff --git a/lua/plugins/overseer.lua b/lua/plugins/overseer.lua
new file mode 100644
index 0000000..5de82ed
--- /dev/null
+++ b/lua/plugins/overseer.lua
@@ -0,0 +1,19 @@
+return {
+  'stevearc/overseer.nvim',
+  config = function()
+    require('overseer').setup({
+      templates = { "builtin", "user.cmake.cmake" },
+    })
+  end,
+  keys = {
+    {
+      '<f4>',
+      function()
+        require('overseer').open()
+        require('overseer').run_template()
+      end,
+      mode = { 'n', 'x' },
+      desc = 'Start task (overseer)',
+    },
+  }
+}
diff --git a/lua/setup/luasnip.lua b/lua/setup/luasnip.lua
deleted file mode 100644
index 33a5a06..0000000
--- a/lua/setup/luasnip.lua
+++ /dev/null
@@ -1,67 +0,0 @@
-local ls = require('luasnip')
--- some shorthands...
-local s = ls.snippet
-local sn = ls.snippet_node
-local isn = ls.indent_snippet_node
-local t = ls.text_node
-local i = ls.insert_node
-local f = ls.function_node
-local c = ls.choice_node
-local d = ls.dynamic_node
-local r = ls.restore_node
-local l = require('luasnip.extras').lambda
-local rep = require('luasnip.extras').rep
-local p = require('luasnip.extras').partial
-local m = require('luasnip.extras').match
-local n = require('luasnip.extras').nonempty
-local dl = require('luasnip.extras').dynamic_lambda
-local fmt = require('luasnip.extras.fmt').fmt
-local fmta = require('luasnip.extras.fmt').fmta
-local types = require('luasnip.util.types')
-local conds = require('luasnip.extras.expand_conditions')
-
-local function getRegA(capitalize)
-  local clipboard = vim.fn.getreg('a')
-  clipboard = clipboard:gsub('^m_', '')
-  if capitalize then
-    clipboard = clipboard:gsub('^%l', string.upper)
-  end
-  return clipboard
-end
-
-
-ls.snippets = {
-  cpp = {
-    s('TEST_F_getset',
-    {
-      t('TEST_F('), i(1, 'TestClass'), t(' ,test_'), p(getRegA, false), t({'_set_get)', '{', '  '}),
-      i(2, 'm_object'), t('.set'), p(getRegA, true), t('('), i(3, '32.F'), t({');', '  '}),
-      i(4, 'EXPECT_EQ('), rep(3), t(', '), rep(2), t('.get'), p(getRegA, true), t({'());', ''}),
-      t({'','}', ''})
-    }),
-    s('TEST_fn_getset',
-    {
-      t('void '), p(getRegA, false), t('_'), i(1, 'get'), t('_'), i(2, 'set'), t({'()', '{', '  '}),
-      i(3, 'm_object'), t('.set'), p(getRegA, true), t('('), i(4, '32.F'), t({');', '  '}),
-      i(5, 'EXPECT_EQ('), rep(4), t(', '), rep(3), t('.get'), p(getRegA, true), t({'());', ''}),
-      t({'','}', '', ''}),
-
-      t('TEST_F('), i(5), t(' ,test_'), p(getRegA, false), t({'_set_get)', '{', '  '}),
-      p(getRegA, false), t('_'), rep(1), t('_'), rep(2), t({'();'}),
-      t({'','}'}),
-    })
-  },
-}
-
-require('luasnip.loaders.from_vscode').lazy_load()
-require('luasnip.loaders.from_vscode').lazy_load({ paths = { "./my-snippets" } })
-
-
-require('legendary').commands(
-  {
-    {
-      ':LuaSnipListAvailable<CR>',
-      description = 'List snippets',
-    }
-  }
-)
diff --git a/lua/setup/my_diffview.lua b/lua/setup/my_diffview.lua
deleted file mode 100644
index eedf472..0000000
--- a/lua/setup/my_diffview.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-local actions = require("diffview.actions")
-
-require("diffview").setup({})
diff --git a/lua/setup/my_gruvbox_flat.lua b/lua/setup/my_gruvbox_flat.lua
deleted file mode 100644
index 668c550..0000000
--- a/lua/setup/my_gruvbox_flat.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-local colors = require('gruvbox.colors')
-vim.g.gruvbox_flat_style = "dark"
-vim.g.gruvbox_colors = {
-  bg_search = 'purple',
-  fg_search = 'black',
-}
-vim.g.gruvbox_theme = {
-  Pmenu = { bg = 'bg_visual'},
-  NormalFloat = { bg = 'bg_visual'}
-}
-vim.g.gruvbox_dark_float = false
-vim.cmd('colorscheme gruvbox-flat')
diff --git a/lua/setup/my_overseer.lua b/lua/setup/my_overseer.lua
deleted file mode 100644
index 82b9060..0000000
--- a/lua/setup/my_overseer.lua
+++ /dev/null
@@ -1,18 +0,0 @@
-local overseer = require('overseer')
-overseer.setup({
-  templates = { "builtin", "user.cmake.cmake" },
-})
-
-require('legendary').keymaps(
-  {
-    {
-      '<f4>',
-      function()
-        overseer.open()
-        overseer.run_template()
-      end,
-      mode = { 'n', 'x' },
-      description = 'Start task (overseer)',
-    },
-  }
-)
diff --git a/lua/setup/neogen.lua b/lua/setup/neogen.lua
deleted file mode 100644
index df16773..0000000
--- a/lua/setup/neogen.lua
+++ /dev/null
@@ -1,29 +0,0 @@
-require('neogen').setup({
-  enabled = true,
-  languages = {
-    cpp = {
-      template = {
-        annotation_convention = 'custom',
-        custom = {
-          { nil, '/// file', { no_results = true, type = { 'file' } } },
-          { nil, '/// $1', { no_results = true, type = { 'func', 'file' } } },
-          { nil, '', { no_results = true, type = { 'file' } } },
-
-          { nil, '/// $1', { type = { 'func' } } },
-          { 'tparam', '/// \\tparam %s $1' },
-          { 'parameters', '/// \\param %s $1' },
-          { 'return_statement', '/// \\return $1' },
-        },
-      },
-    },
-  },
-})
-require('legendary').keymaps(
-  {
-    {
-      '<leader>n',
-      ':Neogen<CR>',
-      description = 'Add comment',
-    }
-  }
-)