diff --git a/README.md b/config/nvim/README.md
similarity index 100%
rename from README.md
rename to config/nvim/README.md
diff --git a/external/efm-langserver b/config/nvim/external/efm-langserver
similarity index 100%
rename from external/efm-langserver
rename to config/nvim/external/efm-langserver
diff --git a/external/tree-sitter b/config/nvim/external/tree-sitter
similarity index 100%
rename from external/tree-sitter
rename to config/nvim/external/tree-sitter
diff --git a/fonts/firacode/nerdfont/Fira Code Bold Nerd Font Complete.ttf b/config/nvim/fonts/firacode/nerdfont/Fira Code Bold Nerd Font Complete.ttf
similarity index 100%
rename from fonts/firacode/nerdfont/Fira Code Bold Nerd Font Complete.ttf
rename to config/nvim/fonts/firacode/nerdfont/Fira Code Bold Nerd Font Complete.ttf
diff --git a/fonts/firacode/nerdfont/Fira Code Light Nerd Font Complete.ttf b/config/nvim/fonts/firacode/nerdfont/Fira Code Light Nerd Font Complete.ttf
similarity index 100%
rename from fonts/firacode/nerdfont/Fira Code Light Nerd Font Complete.ttf
rename to config/nvim/fonts/firacode/nerdfont/Fira Code Light Nerd Font Complete.ttf
diff --git a/fonts/firacode/nerdfont/Fira Code Medium Nerd Font Complete.ttf b/config/nvim/fonts/firacode/nerdfont/Fira Code Medium Nerd Font Complete.ttf
similarity index 100%
rename from fonts/firacode/nerdfont/Fira Code Medium Nerd Font Complete.ttf
rename to config/nvim/fonts/firacode/nerdfont/Fira Code Medium Nerd Font Complete.ttf
diff --git a/fonts/firacode/nerdfont/Fira Code Regular Nerd Font Complete.ttf b/config/nvim/fonts/firacode/nerdfont/Fira Code Regular Nerd Font Complete.ttf
similarity index 100%
rename from fonts/firacode/nerdfont/Fira Code Regular Nerd Font Complete.ttf
rename to config/nvim/fonts/firacode/nerdfont/Fira Code Regular Nerd Font Complete.ttf
diff --git a/fonts/firacode/nerdfont/Fira Code Retina Nerd Font Complete.ttf b/config/nvim/fonts/firacode/nerdfont/Fira Code Retina Nerd Font Complete.ttf
similarity index 100%
rename from fonts/firacode/nerdfont/Fira Code Retina Nerd Font Complete.ttf
rename to config/nvim/fonts/firacode/nerdfont/Fira Code Retina Nerd Font Complete.ttf
diff --git a/fonts/firacode/nerdfont/Fira Code SemiBold Nerd Font Complete.ttf b/config/nvim/fonts/firacode/nerdfont/Fira Code SemiBold Nerd Font Complete.ttf
similarity index 100%
rename from fonts/firacode/nerdfont/Fira Code SemiBold Nerd Font Complete.ttf
rename to config/nvim/fonts/firacode/nerdfont/Fira Code SemiBold Nerd Font Complete.ttf
diff --git a/fonts/firacode/original/FiraCode-Bold.ttf b/config/nvim/fonts/firacode/original/FiraCode-Bold.ttf
similarity index 100%
rename from fonts/firacode/original/FiraCode-Bold.ttf
rename to config/nvim/fonts/firacode/original/FiraCode-Bold.ttf
diff --git a/fonts/firacode/original/FiraCode-Light.ttf b/config/nvim/fonts/firacode/original/FiraCode-Light.ttf
similarity index 100%
rename from fonts/firacode/original/FiraCode-Light.ttf
rename to config/nvim/fonts/firacode/original/FiraCode-Light.ttf
diff --git a/fonts/firacode/original/FiraCode-Medium.ttf b/config/nvim/fonts/firacode/original/FiraCode-Medium.ttf
similarity index 100%
rename from fonts/firacode/original/FiraCode-Medium.ttf
rename to config/nvim/fonts/firacode/original/FiraCode-Medium.ttf
diff --git a/fonts/firacode/original/FiraCode-Regular.ttf b/config/nvim/fonts/firacode/original/FiraCode-Regular.ttf
similarity index 100%
rename from fonts/firacode/original/FiraCode-Regular.ttf
rename to config/nvim/fonts/firacode/original/FiraCode-Regular.ttf
diff --git a/fonts/firacode/original/FiraCode-Retina.ttf b/config/nvim/fonts/firacode/original/FiraCode-Retina.ttf
similarity index 100%
rename from fonts/firacode/original/FiraCode-Retina.ttf
rename to config/nvim/fonts/firacode/original/FiraCode-Retina.ttf
diff --git a/fonts/firacode/original/FiraCode-SemiBold.ttf b/config/nvim/fonts/firacode/original/FiraCode-SemiBold.ttf
similarity index 100%
rename from fonts/firacode/original/FiraCode-SemiBold.ttf
rename to config/nvim/fonts/firacode/original/FiraCode-SemiBold.ttf
diff --git a/fonts/nerdfont_symbols/Symbols-1000-em Nerd Font Complete Mono Windows Compatible.ttf b/config/nvim/fonts/nerdfont_symbols/Symbols-1000-em Nerd Font Complete Mono Windows Compatible.ttf
similarity index 100%
rename from fonts/nerdfont_symbols/Symbols-1000-em Nerd Font Complete Mono Windows Compatible.ttf
rename to config/nvim/fonts/nerdfont_symbols/Symbols-1000-em Nerd Font Complete Mono Windows Compatible.ttf
diff --git a/fonts/nerdfont_symbols/Symbols-1000-em Nerd Font Complete Mono.ttf b/config/nvim/fonts/nerdfont_symbols/Symbols-1000-em Nerd Font Complete Mono.ttf
similarity index 100%
rename from fonts/nerdfont_symbols/Symbols-1000-em Nerd Font Complete Mono.ttf
rename to config/nvim/fonts/nerdfont_symbols/Symbols-1000-em Nerd Font Complete Mono.ttf
diff --git a/fonts/nerdfont_symbols/Symbols-1000-em Nerd Font Complete Windows Compatible.ttf b/config/nvim/fonts/nerdfont_symbols/Symbols-1000-em Nerd Font Complete Windows Compatible.ttf
similarity index 100%
rename from fonts/nerdfont_symbols/Symbols-1000-em Nerd Font Complete Windows Compatible.ttf
rename to config/nvim/fonts/nerdfont_symbols/Symbols-1000-em Nerd Font Complete Windows Compatible.ttf
diff --git a/fonts/nerdfont_symbols/Symbols-1000-em Nerd Font Complete.ttf b/config/nvim/fonts/nerdfont_symbols/Symbols-1000-em Nerd Font Complete.ttf
similarity index 100%
rename from fonts/nerdfont_symbols/Symbols-1000-em Nerd Font Complete.ttf
rename to config/nvim/fonts/nerdfont_symbols/Symbols-1000-em Nerd Font Complete.ttf
diff --git a/fonts/nerdfont_symbols/Symbols-2048-em Nerd Font Complete Mono Windows Compatible.ttf b/config/nvim/fonts/nerdfont_symbols/Symbols-2048-em Nerd Font Complete Mono Windows Compatible.ttf
similarity index 100%
rename from fonts/nerdfont_symbols/Symbols-2048-em Nerd Font Complete Mono Windows Compatible.ttf
rename to config/nvim/fonts/nerdfont_symbols/Symbols-2048-em Nerd Font Complete Mono Windows Compatible.ttf
diff --git a/fonts/nerdfont_symbols/Symbols-2048-em Nerd Font Complete Mono.ttf b/config/nvim/fonts/nerdfont_symbols/Symbols-2048-em Nerd Font Complete Mono.ttf
similarity index 100%
rename from fonts/nerdfont_symbols/Symbols-2048-em Nerd Font Complete Mono.ttf
rename to config/nvim/fonts/nerdfont_symbols/Symbols-2048-em Nerd Font Complete Mono.ttf
diff --git a/fonts/nerdfont_symbols/Symbols-2048-em Nerd Font Complete Windows Compatible.ttf b/config/nvim/fonts/nerdfont_symbols/Symbols-2048-em Nerd Font Complete Windows Compatible.ttf
similarity index 100%
rename from fonts/nerdfont_symbols/Symbols-2048-em Nerd Font Complete Windows Compatible.ttf
rename to config/nvim/fonts/nerdfont_symbols/Symbols-2048-em Nerd Font Complete Windows Compatible.ttf
diff --git a/fonts/nerdfont_symbols/Symbols-2048-em Nerd Font Complete.ttf b/config/nvim/fonts/nerdfont_symbols/Symbols-2048-em Nerd Font Complete.ttf
similarity index 100%
rename from fonts/nerdfont_symbols/Symbols-2048-em Nerd Font Complete.ttf
rename to config/nvim/fonts/nerdfont_symbols/Symbols-2048-em Nerd Font Complete.ttf
diff --git a/fonts/nerdfont_symbols/readme.md b/config/nvim/fonts/nerdfont_symbols/readme.md
similarity index 100%
rename from fonts/nerdfont_symbols/readme.md
rename to config/nvim/fonts/nerdfont_symbols/readme.md
diff --git a/init.lua b/config/nvim/init.lua
similarity index 100%
rename from init.lua
rename to config/nvim/init.lua
diff --git a/install.sh b/config/nvim/install.sh
similarity index 100%
rename from install.sh
rename to config/nvim/install.sh
diff --git a/lua/config_plugins/config_aerial.lua b/config/nvim/lua/config_plugins/config_aerial.lua
similarity index 100%
rename from lua/config_plugins/config_aerial.lua
rename to config/nvim/lua/config_plugins/config_aerial.lua
diff --git a/lua/config_plugins/config_gitsigns.lua b/config/nvim/lua/config_plugins/config_gitsigns.lua
similarity index 100%
rename from lua/config_plugins/config_gitsigns.lua
rename to config/nvim/lua/config_plugins/config_gitsigns.lua
diff --git a/lua/config_plugins/config_lsp.lua b/config/nvim/lua/config_plugins/config_lsp.lua
similarity index 100%
rename from lua/config_plugins/config_lsp.lua
rename to config/nvim/lua/config_plugins/config_lsp.lua
diff --git a/lua/config_plugins/config_lualine.lua b/config/nvim/lua/config_plugins/config_lualine.lua
similarity index 100%
rename from lua/config_plugins/config_lualine.lua
rename to config/nvim/lua/config_plugins/config_lualine.lua
diff --git a/lua/config_plugins/config_nvim-tree.lua b/config/nvim/lua/config_plugins/config_nvim-tree.lua
similarity index 100%
rename from lua/config_plugins/config_nvim-tree.lua
rename to config/nvim/lua/config_plugins/config_nvim-tree.lua
diff --git a/lua/config_plugins/config_onedark.lua b/config/nvim/lua/config_plugins/config_onedark.lua
similarity index 100%
rename from lua/config_plugins/config_onedark.lua
rename to config/nvim/lua/config_plugins/config_onedark.lua
diff --git a/lua/config_plugins/config_sniprun.lua b/config/nvim/lua/config_plugins/config_sniprun.lua
similarity index 100%
rename from lua/config_plugins/config_sniprun.lua
rename to config/nvim/lua/config_plugins/config_sniprun.lua
diff --git a/lua/config_plugins/config_telescope.lua b/config/nvim/lua/config_plugins/config_telescope.lua
similarity index 100%
rename from lua/config_plugins/config_telescope.lua
rename to config/nvim/lua/config_plugins/config_telescope.lua
diff --git a/lua/config_plugins/config_toggleterm.lua b/config/nvim/lua/config_plugins/config_toggleterm.lua
similarity index 100%
rename from lua/config_plugins/config_toggleterm.lua
rename to config/nvim/lua/config_plugins/config_toggleterm.lua
diff --git a/lua/config_plugins/config_treesitter.lua b/config/nvim/lua/config_plugins/config_treesitter.lua
similarity index 100%
rename from lua/config_plugins/config_treesitter.lua
rename to config/nvim/lua/config_plugins/config_treesitter.lua
diff --git a/lua/config_plugins/config_trouble.lua b/config/nvim/lua/config_plugins/config_trouble.lua
similarity index 100%
rename from lua/config_plugins/config_trouble.lua
rename to config/nvim/lua/config_plugins/config_trouble.lua
diff --git a/lua/filetypes.lua b/config/nvim/lua/filetypes.lua
similarity index 100%
rename from lua/filetypes.lua
rename to config/nvim/lua/filetypes.lua
diff --git a/lua/keymaps.lua b/config/nvim/lua/keymaps.lua
similarity index 100%
rename from lua/keymaps.lua
rename to config/nvim/lua/keymaps.lua
diff --git a/lua/neovide.lua b/config/nvim/lua/neovide.lua
similarity index 100%
rename from lua/neovide.lua
rename to config/nvim/lua/neovide.lua
diff --git a/lua/options.lua b/config/nvim/lua/options.lua
similarity index 100%
rename from lua/options.lua
rename to config/nvim/lua/options.lua
diff --git a/lua/plugins.lua b/config/nvim/lua/plugins.lua
similarity index 100%
rename from lua/plugins.lua
rename to config/nvim/lua/plugins.lua
diff --git a/lua/vimcommands.lua b/config/nvim/lua/vimcommands.lua
similarity index 100%
rename from lua/vimcommands.lua
rename to config/nvim/lua/vimcommands.lua
diff --git a/true_colour_tests/24-bit-color.sh b/config/nvim/true_colour_tests/24-bit-color.sh
similarity index 100%
rename from true_colour_tests/24-bit-color.sh
rename to config/nvim/true_colour_tests/24-bit-color.sh
diff --git a/true_colour_tests/TrueColour.md b/config/nvim/true_colour_tests/TrueColour.md
similarity index 100%
rename from true_colour_tests/TrueColour.md
rename to config/nvim/true_colour_tests/TrueColour.md
diff --git a/true_colour_tests/color-spaces.pl b/config/nvim/true_colour_tests/color-spaces.pl
similarity index 100%
rename from true_colour_tests/color-spaces.pl
rename to config/nvim/true_colour_tests/color-spaces.pl
diff --git a/true_colour_tests/cscale.sh b/config/nvim/true_colour_tests/cscale.sh
similarity index 100%
rename from true_colour_tests/cscale.sh
rename to config/nvim/true_colour_tests/cscale.sh
diff --git a/tmux.conf b/config/tmux.conf
similarity index 100%
rename from tmux.conf
rename to config/tmux.conf