diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index e26603d..44a4aa7 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -1,3 +1,13 @@
-require "opdavies.vim"
-
-require "opdavies.packer"
+require("opdavies.colours")
+require("opdavies.comment")
+require("opdavies.completion")
+require("opdavies.floaterm")
+require("opdavies.gitsigns")
+require("opdavies.indent-blankline")
+require("opdavies.lspconfig")
+require("opdavies.options")
+require("opdavies.plugins")
+require("opdavies.seiya")
+require("opdavies.telescope")
+require("opdavies.treesitter")
+require("opdavies.vim-test")
diff --git a/nvim/.config/nvim/after/plugin/colours.lua b/nvim/.config/nvim/lua/opdavies/colours.lua
similarity index 100%
rename from nvim/.config/nvim/after/plugin/colours.lua
rename to nvim/.config/nvim/lua/opdavies/colours.lua
diff --git a/nvim/.config/nvim/after/plugin/comment.lua b/nvim/.config/nvim/lua/opdavies/comment.lua
similarity index 100%
rename from nvim/.config/nvim/after/plugin/comment.lua
rename to nvim/.config/nvim/lua/opdavies/comment.lua
diff --git a/nvim/.config/nvim/after/plugin/completion.lua b/nvim/.config/nvim/lua/opdavies/completion.lua
similarity index 100%
rename from nvim/.config/nvim/after/plugin/completion.lua
rename to nvim/.config/nvim/lua/opdavies/completion.lua
diff --git a/nvim/.config/nvim/after/plugin/floaterm.lua b/nvim/.config/nvim/lua/opdavies/floaterm.lua
similarity index 100%
rename from nvim/.config/nvim/after/plugin/floaterm.lua
rename to nvim/.config/nvim/lua/opdavies/floaterm.lua
diff --git a/nvim/.config/nvim/after/plugin/gitsigns.lua b/nvim/.config/nvim/lua/opdavies/gitsigns.lua
similarity index 100%
rename from nvim/.config/nvim/after/plugin/gitsigns.lua
rename to nvim/.config/nvim/lua/opdavies/gitsigns.lua
diff --git a/nvim/.config/nvim/after/plugin/indent-blankline.lua b/nvim/.config/nvim/lua/opdavies/indent-blankline.lua
similarity index 100%
rename from nvim/.config/nvim/after/plugin/indent-blankline.lua
rename to nvim/.config/nvim/lua/opdavies/indent-blankline.lua
diff --git a/nvim/.config/nvim/after/plugin/lspconfig.lua b/nvim/.config/nvim/lua/opdavies/lspconfig.lua
similarity index 100%
rename from nvim/.config/nvim/after/plugin/lspconfig.lua
rename to nvim/.config/nvim/lua/opdavies/lspconfig.lua
diff --git a/nvim/.config/nvim/lua/opdavies/vim.lua b/nvim/.config/nvim/lua/opdavies/options.lua
similarity index 100%
rename from nvim/.config/nvim/lua/opdavies/vim.lua
rename to nvim/.config/nvim/lua/opdavies/options.lua
diff --git a/nvim/.config/nvim/lua/opdavies/packer.lua b/nvim/.config/nvim/lua/opdavies/plugins.lua
similarity index 100%
rename from nvim/.config/nvim/lua/opdavies/packer.lua
rename to nvim/.config/nvim/lua/opdavies/plugins.lua
diff --git a/nvim/.config/nvim/after/plugin/seiya.lua b/nvim/.config/nvim/lua/opdavies/seiya.lua
similarity index 100%
rename from nvim/.config/nvim/after/plugin/seiya.lua
rename to nvim/.config/nvim/lua/opdavies/seiya.lua
diff --git a/nvim/.config/nvim/after/plugin/telescope.lua b/nvim/.config/nvim/lua/opdavies/telescope/init.lua
similarity index 100%
rename from nvim/.config/nvim/after/plugin/telescope.lua
rename to nvim/.config/nvim/lua/opdavies/telescope/init.lua
diff --git a/nvim/.config/nvim/after/plugin/treesitter.lua b/nvim/.config/nvim/lua/opdavies/treesitter.lua
similarity index 100%
rename from nvim/.config/nvim/after/plugin/treesitter.lua
rename to nvim/.config/nvim/lua/opdavies/treesitter.lua
diff --git a/nvim/.config/nvim/after/plugin/vim-test.lua b/nvim/.config/nvim/lua/opdavies/vim-test.lua
similarity index 100%
rename from nvim/.config/nvim/after/plugin/vim-test.lua
rename to nvim/.config/nvim/lua/opdavies/vim-test.lua