diff --git a/init.lua b/init.lua
index 07f156e..659800b 100644
--- a/init.lua
+++ b/init.lua
@@ -10,10 +10,6 @@ require('my_plugins')
 require('my_keymappings')
 require('my_options')
 require("my_autocommands")
-
--- plugins
-require('my_neogen')
-require('my_luasnip')
 -------------------- TREE-SITTER ---------------------------
 require('nvim-treesitter.configs').setup({
   ensure_installed = 'maintained',
diff --git a/lua/my_plugins.lua b/lua/my_plugins.lua
index f61d3a5..ad8fda5 100644
--- a/lua/my_plugins.lua
+++ b/lua/my_plugins.lua
@@ -68,6 +68,9 @@ return require('packer').startup(function()
     },
     config = get_setup("cmp")
   }
+  use {'L3MON4D3/LuaSnip',
+    config = get_setup("luasnip")
+  }
   use {'rafamadriz/friendly-snippets'}
   use {'onsails/lspkind-nvim'}
   use {'Shatur/neovim-cmake',
@@ -94,7 +97,8 @@ return require('packer').startup(function()
   }
   use {
     'danymat/neogen',
-    requires = 'nvim-treesitter/nvim-treesitter'
+    requires = 'nvim-treesitter/nvim-treesitter',
+    config = get_setup("neogen")
   }
   use {'abecodes/tabout.nvim'}
   use {'stevearc/dressing.nvim'}
diff --git a/lua/my_luasnip.lua b/lua/setup/luasnip.lua
similarity index 97%
rename from lua/my_luasnip.lua
rename to lua/setup/luasnip.lua
index 96b0bcf..641fdf9 100644
--- a/lua/my_luasnip.lua
+++ b/lua/setup/luasnip.lua
@@ -1,56 +1,56 @@
-local ls = require("luasnip")
-require("luasnip.loaders.from_vscode").load()
--- 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({'','}'}),
-    })
-  },
-}
+local ls = require("luasnip")
+require("luasnip.loaders.from_vscode").load()
+-- 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({'','}'}),
+    })
+  },
+}
diff --git a/lua/my_neogen.lua b/lua/setup/neogen.lua
similarity index 100%
rename from lua/my_neogen.lua
rename to lua/setup/neogen.lua