diff --git a/roles/neovim/files/lua/opdavies/autopairs.lua b/roles/neovim/files/after/plugin/autopairs.lua
similarity index 100%
rename from roles/neovim/files/lua/opdavies/autopairs.lua
rename to roles/neovim/files/after/plugin/autopairs.lua
diff --git a/roles/neovim/files/lua/opdavies/colours.lua b/roles/neovim/files/after/plugin/colours.lua
similarity index 100%
rename from roles/neovim/files/lua/opdavies/colours.lua
rename to roles/neovim/files/after/plugin/colours.lua
diff --git a/roles/neovim/files/lua/opdavies/comment.lua b/roles/neovim/files/after/plugin/comment.lua
similarity index 100%
rename from roles/neovim/files/lua/opdavies/comment.lua
rename to roles/neovim/files/after/plugin/comment.lua
diff --git a/roles/neovim/files/lua/opdavies/completion.lua b/roles/neovim/files/after/plugin/completion.lua
similarity index 100%
rename from roles/neovim/files/lua/opdavies/completion.lua
rename to roles/neovim/files/after/plugin/completion.lua
diff --git a/roles/neovim/files/lua/opdavies/floaterm.lua b/roles/neovim/files/after/plugin/floaterm.lua
similarity index 100%
rename from roles/neovim/files/lua/opdavies/floaterm.lua
rename to roles/neovim/files/after/plugin/floaterm.lua
diff --git a/roles/neovim/files/lua/opdavies/gitsigns.lua b/roles/neovim/files/after/plugin/gitsigns.lua
similarity index 100%
rename from roles/neovim/files/lua/opdavies/gitsigns.lua
rename to roles/neovim/files/after/plugin/gitsigns.lua
diff --git a/roles/neovim/files/lua/opdavies/indent-blankline.lua b/roles/neovim/files/after/plugin/indent-blankline.lua
similarity index 100%
rename from roles/neovim/files/lua/opdavies/indent-blankline.lua
rename to roles/neovim/files/after/plugin/indent-blankline.lua
diff --git a/roles/neovim/files/after/plugin/luasnip.lua b/roles/neovim/files/after/plugin/luasnip.lua
index 169b32d6..7694d480 100644
--- a/roles/neovim/files/after/plugin/luasnip.lua
+++ b/roles/neovim/files/after/plugin/luasnip.lua
@@ -13,7 +13,7 @@ local php = require "opdavies.snippets.php"
 
 local snippets = {
   js = javascript,
-  markdown = markdown,
+  all = markdown,
   php = php,
   typescript = javascript,
   vue = javascript,
diff --git a/roles/neovim/files/after/plugin/seiya.lua b/roles/neovim/files/after/plugin/seiya.lua
new file mode 100644
index 00000000..91ee4ab0
--- /dev/null
+++ b/roles/neovim/files/after/plugin/seiya.lua
@@ -0,0 +1,3 @@
+-- vim.g.seiya_auto_enable = 1
+
+-- vim.g.seiya_target_groups = { "guibg" }
diff --git a/roles/neovim/files/lua/opdavies/treesitter.lua b/roles/neovim/files/after/plugin/treesitter.lua
similarity index 100%
rename from roles/neovim/files/lua/opdavies/treesitter.lua
rename to roles/neovim/files/after/plugin/treesitter.lua
diff --git a/roles/neovim/files/lua/opdavies/vim-test.lua b/roles/neovim/files/after/plugin/vim-test.lua
similarity index 100%
rename from roles/neovim/files/lua/opdavies/vim-test.lua
rename to roles/neovim/files/after/plugin/vim-test.lua
diff --git a/roles/neovim/files/init.lua b/roles/neovim/files/init.lua
index 7ae79a78..2917b6b1 100644
--- a/roles/neovim/files/init.lua
+++ b/roles/neovim/files/init.lua
@@ -1,14 +1,4 @@
-require "opdavies.autopairs"
-require "opdavies.colours"
-require "opdavies.comment"
-require "opdavies.completion"
-require "opdavies.floaterm"
-require "opdavies.gitsigns"
-require "opdavies.indent-blankline"
 require "opdavies.lsp"
 require("opdavies.options").setup()
 require "opdavies.plugins"
-require "opdavies.seiya"
 require "opdavies.telescope"
-require "opdavies.treesitter"
-require "opdavies.vim-test"
diff --git a/roles/neovim/files/lua/opdavies/seiya.lua b/roles/neovim/files/lua/opdavies/seiya.lua
deleted file mode 100644
index 96c3493a..00000000
--- a/roles/neovim/files/lua/opdavies/seiya.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vim.g.seiya_auto_enable = 1
-
-vim.g.seiya_target_groups = { "guibg" }