diff --git a/lazy-lock.json b/.config/nvim/.lazy-lock.json
similarity index 97%
rename from lazy-lock.json
rename to .config/nvim/.lazy-lock.json
index 91e828e..12bc127 100644
--- a/lazy-lock.json
+++ b/.config/nvim/.lazy-lock.json
@@ -11,7 +11,6 @@
   "compiler.nvim": { "branch": "main", "commit": "c1d92304fdf478342668b991739ffab46b219d7c" },
   "conform.nvim": { "branch": "master", "commit": "61cff430c9f15770d0c5e68c1b08067223bd94ab" },
   "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
-  "distroupgrade.nvim": { "branch": "main", "commit": "c3210e79f049cd6bf78e661d19e42b473a0aa686" },
   "git.nvim": { "branch": "main", "commit": "6b4a66f8a66e567bf27a0ef1de72cf5e338df4c3" },
   "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
   "image.nvim": { "branch": "master", "commit": "4c6cb5ad93ee93d8d7b7c84e1eb291cee99f0a0e" },
diff --git a/en_dict.txt b/.config/nvim/en_dict.txt
similarity index 100%
rename from en_dict.txt
rename to .config/nvim/en_dict.txt
diff --git a/init.lua b/.config/nvim/init.lua
similarity index 97%
rename from init.lua
rename to .config/nvim/init.lua
index 9c33f8f..cdf90e4 100644
--- a/init.lua
+++ b/.config/nvim/init.lua
@@ -107,20 +107,6 @@ Plugins = { -- Plugins to use
     { 'stevearc/aerial.nvim' }, -- Object viewer
     { 'caenrique/swap-buffers.nvim' }, -- Swap buffers
     { 'LunarVim/bigfile.nvim' }, -- Disable heavy features if the file is big
-    { 'Zeioth/distroupgrade.nvim',
-        dependencies = {
-            'nvim-lua/plenary.nvim',
-        },
-        event = 'VeryLazy',
-        opts = function()
-            local config_dir = vim.fn.stdpath('config')
-
-            return {
-                remote = "origin",
-                release_tag = nil,
-            }
-        end
-    }, -- Allow for easy updating
 }
 
 opt.title = true -- Display title
diff --git a/lua/accelerated_config.lua b/.config/nvim/lua/accelerated_config.lua
similarity index 100%
rename from lua/accelerated_config.lua
rename to .config/nvim/lua/accelerated_config.lua
diff --git a/lua/aerial_config.lua b/.config/nvim/lua/aerial_config.lua
similarity index 100%
rename from lua/aerial_config.lua
rename to .config/nvim/lua/aerial_config.lua
diff --git a/lua/autoclose_config.lua b/.config/nvim/lua/autoclose_config.lua
similarity index 100%
rename from lua/autoclose_config.lua
rename to .config/nvim/lua/autoclose_config.lua
diff --git a/lua/bigfile_config.lua b/.config/nvim/lua/bigfile_config.lua
similarity index 100%
rename from lua/bigfile_config.lua
rename to .config/nvim/lua/bigfile_config.lua
diff --git a/lua/bootstrap.lua b/.config/nvim/lua/bootstrap.lua
similarity index 100%
rename from lua/bootstrap.lua
rename to .config/nvim/lua/bootstrap.lua
diff --git a/lua/bufferline_config.lua b/.config/nvim/lua/bufferline_config.lua
similarity index 100%
rename from lua/bufferline_config.lua
rename to .config/nvim/lua/bufferline_config.lua
diff --git a/lua/ccc_config.lua b/.config/nvim/lua/ccc_config.lua
similarity index 100%
rename from lua/ccc_config.lua
rename to .config/nvim/lua/ccc_config.lua
diff --git a/lua/colorizer_config.lua b/.config/nvim/lua/colorizer_config.lua
similarity index 100%
rename from lua/colorizer_config.lua
rename to .config/nvim/lua/colorizer_config.lua
diff --git a/lua/compiler_config.lua b/.config/nvim/lua/compiler_config.lua
similarity index 100%
rename from lua/compiler_config.lua
rename to .config/nvim/lua/compiler_config.lua
diff --git a/lua/conform_config.lua b/.config/nvim/lua/conform_config.lua
similarity index 100%
rename from lua/conform_config.lua
rename to .config/nvim/lua/conform_config.lua
diff --git a/lua/git_config.lua b/.config/nvim/lua/git_config.lua
similarity index 100%
rename from lua/git_config.lua
rename to .config/nvim/lua/git_config.lua
diff --git a/lua/gitsigns_config.lua b/.config/nvim/lua/gitsigns_config.lua
similarity index 100%
rename from lua/gitsigns_config.lua
rename to .config/nvim/lua/gitsigns_config.lua
diff --git a/lua/ibl_config.lua b/.config/nvim/lua/ibl_config.lua
similarity index 100%
rename from lua/ibl_config.lua
rename to .config/nvim/lua/ibl_config.lua
diff --git a/lua/illuminate_config.lua b/.config/nvim/lua/illuminate_config.lua
similarity index 100%
rename from lua/illuminate_config.lua
rename to .config/nvim/lua/illuminate_config.lua
diff --git a/lua/image_config.lua b/.config/nvim/lua/image_config.lua
similarity index 100%
rename from lua/image_config.lua
rename to .config/nvim/lua/image_config.lua
diff --git a/lua/lsp_config.lua b/.config/nvim/lua/lsp_config.lua
similarity index 100%
rename from lua/lsp_config.lua
rename to .config/nvim/lua/lsp_config.lua
diff --git a/lua/lualine_config.lua b/.config/nvim/lua/lualine_config.lua
similarity index 100%
rename from lua/lualine_config.lua
rename to .config/nvim/lua/lualine_config.lua
diff --git a/lua/neogit_config.lua b/.config/nvim/lua/neogit_config.lua
similarity index 100%
rename from lua/neogit_config.lua
rename to .config/nvim/lua/neogit_config.lua
diff --git a/lua/noice_config.lua b/.config/nvim/lua/noice_config.lua
similarity index 100%
rename from lua/noice_config.lua
rename to .config/nvim/lua/noice_config.lua
diff --git a/lua/project_config.lua b/.config/nvim/lua/project_config.lua
similarity index 100%
rename from lua/project_config.lua
rename to .config/nvim/lua/project_config.lua
diff --git a/lua/session_manager.lua b/.config/nvim/lua/session_manager.lua
similarity index 100%
rename from lua/session_manager.lua
rename to .config/nvim/lua/session_manager.lua
diff --git a/lua/setup.lua b/.config/nvim/lua/setup.lua
similarity index 100%
rename from lua/setup.lua
rename to .config/nvim/lua/setup.lua
diff --git a/lua/swapbuffers_config.lua b/.config/nvim/lua/swapbuffers_config.lua
similarity index 100%
rename from lua/swapbuffers_config.lua
rename to .config/nvim/lua/swapbuffers_config.lua
diff --git a/lua/telescope_config.lua b/.config/nvim/lua/telescope_config.lua
similarity index 100%
rename from lua/telescope_config.lua
rename to .config/nvim/lua/telescope_config.lua
diff --git a/lua/theme_config.lua b/.config/nvim/lua/theme_config.lua
similarity index 100%
rename from lua/theme_config.lua
rename to .config/nvim/lua/theme_config.lua
diff --git a/lua/translate_config.lua b/.config/nvim/lua/translate_config.lua
similarity index 100%
rename from lua/translate_config.lua
rename to .config/nvim/lua/translate_config.lua
diff --git a/lua/tree_config.lua b/.config/nvim/lua/tree_config.lua
similarity index 100%
rename from lua/tree_config.lua
rename to .config/nvim/lua/tree_config.lua
diff --git a/lua/trouble_config.lua b/.config/nvim/lua/trouble_config.lua
similarity index 100%
rename from lua/trouble_config.lua
rename to .config/nvim/lua/trouble_config.lua
diff --git a/lua/ts_config.lua b/.config/nvim/lua/ts_config.lua
similarity index 100%
rename from lua/ts_config.lua
rename to .config/nvim/lua/ts_config.lua
diff --git a/lua/whichkey_config.lua b/.config/nvim/lua/whichkey_config.lua
similarity index 100%
rename from lua/whichkey_config.lua
rename to .config/nvim/lua/whichkey_config.lua
diff --git a/spell/en.utf-8.spl b/.config/nvim/spell/en.utf-8.spl
similarity index 100%
rename from spell/en.utf-8.spl
rename to .config/nvim/spell/en.utf-8.spl
diff --git a/spell/sv.utf-8.spl b/.config/nvim/spell/sv.utf-8.spl
similarity index 100%
rename from spell/sv.utf-8.spl
rename to .config/nvim/spell/sv.utf-8.spl
diff --git a/commit.sh b/commit.sh
index 5152fca..3c995fd 100755
--- a/commit.sh
+++ b/commit.sh
@@ -1,9 +1,13 @@
 #!/bin/sh
 
 if [ -e "$HOME/.config/nvim" ]; then
-    cp -r $HOME/.config/nvim/* .
+    rm -rf .config/nvim
+    mkdir -p .config
+    cp -r $HOME/.config/nvim .config/
+    rm -f .config/nvim/.session.nvim
+    mv .config/nvim/lazy-lock.json .config/nvim/.lazy-lock.json
 
-    git add *
+    git add .config/* screenshots/ commit.sh install.sh
     git commit -a -m "speedie-nvim | Add new config"
     git push
 fi
diff --git a/install.ps1 b/install.ps1
index 5745b9f..50a3cb7 100755
--- a/install.ps1
+++ b/install.ps1
@@ -10,8 +10,7 @@ if (Test-Path "$env:USERPROFILE\AppData\Local\nvim") {
     Remove-Item -Path "$env:USERPROFILE\AppData\Local\nvim" -Recurse -Force
 }
 
-New-Item -Path "$env:USERPROFILE\AppData\Local\nvim"
-Copy-Item -Path * -Destination "$env:USERPROFILE\AppData\Local\nvim" -Recurse -Force
+Copy-Item -Path ".config\nvim" -Destination "$env:USERPROFILE\AppData\Local\" -Recurse -Force
 New-Item -Path "$env:USERPROFILE\AppData\Local\nvim\spell" -ItemType Directory -Force
 
 Write-Output "installed."
diff --git a/install.sh b/install.sh
index 1e366e1..02ffe2b 100755
--- a/install.sh
+++ b/install.sh
@@ -3,7 +3,7 @@ echo 3; sleep 1; echo 2; sleep 1; echo 1; sleep 1
 
 [ -e "$HOME/.config/nvim" ] && cp -r $HOME/.config/nvim /tmp/nvim-backup && rm -rf $HOME/.config/nvim
 
-cp -r * .git $HOME/.config/nvim
+cp -r .config/nvim $HOME/.config/
 mkdir -p $HOME/.config/nvim/spell
 
 echo "installed."