diff --git a/nvim/m-housh/init.lua b/nvim/m-housh/init.lua
index f71bb60..7100f87 100644
--- a/nvim/m-housh/init.lua
+++ b/nvim/m-housh/init.lua
@@ -1,14 +1,14 @@
 
-require('plugins')
+require('user.plugins')
 
 -- Key maps
-require('mappings')
+require('user.mappings')
 
 -- Common settings
-require('settings')
+require('user.settings')
 
 -- Auto commands
-require('autocmd')
+require('user.autocmd')
 
 -- Theme
-require('theme')
+require('user.theme')
diff --git a/nvim/m-housh/lua/autocmd.lua b/nvim/m-housh/lua/user/autocmd.lua
similarity index 100%
rename from nvim/m-housh/lua/autocmd.lua
rename to nvim/m-housh/lua/user/autocmd.lua
diff --git a/nvim/m-housh/lua/mappings.lua b/nvim/m-housh/lua/user/mappings.lua
similarity index 100%
rename from nvim/m-housh/lua/mappings.lua
rename to nvim/m-housh/lua/user/mappings.lua
diff --git a/nvim/m-housh/lua/plugin-config/cmp.lua b/nvim/m-housh/lua/user/plugin-config/cmp.lua
similarity index 100%
rename from nvim/m-housh/lua/plugin-config/cmp.lua
rename to nvim/m-housh/lua/user/plugin-config/cmp.lua
diff --git a/nvim/m-housh/lua/plugin-config/diffview.lua b/nvim/m-housh/lua/user/plugin-config/diffview.lua
similarity index 100%
rename from nvim/m-housh/lua/plugin-config/diffview.lua
rename to nvim/m-housh/lua/user/plugin-config/diffview.lua
diff --git a/nvim/m-housh/lua/plugin-config/init.lua b/nvim/m-housh/lua/user/plugin-config/init.lua
similarity index 100%
rename from nvim/m-housh/lua/plugin-config/init.lua
rename to nvim/m-housh/lua/user/plugin-config/init.lua
diff --git a/nvim/m-housh/lua/plugin-config/lsp.lua b/nvim/m-housh/lua/user/plugin-config/lsp.lua
similarity index 100%
rename from nvim/m-housh/lua/plugin-config/lsp.lua
rename to nvim/m-housh/lua/user/plugin-config/lsp.lua
diff --git a/nvim/m-housh/lua/plugin-config/lualine.lua b/nvim/m-housh/lua/user/plugin-config/lualine.lua
similarity index 100%
rename from nvim/m-housh/lua/plugin-config/lualine.lua
rename to nvim/m-housh/lua/user/plugin-config/lualine.lua
diff --git a/nvim/m-housh/lua/plugin-config/neogit.lua b/nvim/m-housh/lua/user/plugin-config/neogit.lua
similarity index 100%
rename from nvim/m-housh/lua/plugin-config/neogit.lua
rename to nvim/m-housh/lua/user/plugin-config/neogit.lua
diff --git a/nvim/m-housh/lua/plugin-config/telescope.lua b/nvim/m-housh/lua/user/plugin-config/telescope.lua
similarity index 100%
rename from nvim/m-housh/lua/plugin-config/telescope.lua
rename to nvim/m-housh/lua/user/plugin-config/telescope.lua
diff --git a/nvim/m-housh/lua/plugin-config/treesitter.lua b/nvim/m-housh/lua/user/plugin-config/treesitter.lua
similarity index 100%
rename from nvim/m-housh/lua/plugin-config/treesitter.lua
rename to nvim/m-housh/lua/user/plugin-config/treesitter.lua
diff --git a/nvim/m-housh/lua/plugins.lua b/nvim/m-housh/lua/user/plugins.lua
similarity index 95%
rename from nvim/m-housh/lua/plugins.lua
rename to nvim/m-housh/lua/user/plugins.lua
index c280baa..6353c1a 100644
--- a/nvim/m-housh/lua/plugins.lua
+++ b/nvim/m-housh/lua/user/plugins.lua
@@ -16,7 +16,7 @@ vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
 
 require("lazy").setup(
-  'plugin-config',
+  'user.plugin-config',
   {
     dev = {
       path = '~/LocalProjects/plugins',
diff --git a/nvim/m-housh/lua/settings.lua b/nvim/m-housh/lua/user/settings.lua
similarity index 100%
rename from nvim/m-housh/lua/settings.lua
rename to nvim/m-housh/lua/user/settings.lua
diff --git a/nvim/m-housh/lua/snippets/init.lua b/nvim/m-housh/lua/user/snippets/init.lua
similarity index 100%
rename from nvim/m-housh/lua/snippets/init.lua
rename to nvim/m-housh/lua/user/snippets/init.lua
diff --git a/nvim/m-housh/lua/theme.lua b/nvim/m-housh/lua/user/theme.lua
similarity index 100%
rename from nvim/m-housh/lua/theme.lua
rename to nvim/m-housh/lua/user/theme.lua