diff --git a/nvim/lua/config/indent.lua b/nvim/lua/config/indent.lua
index ba359fc..7b1ec4e 100644
--- a/nvim/lua/config/indent.lua
+++ b/nvim/lua/config/indent.lua
@@ -2,6 +2,7 @@ local autocmd = vim.api.nvim_create_autocmd
 local augroup = vim.api.nvim_create_augroup
 local set = vim.opt
 
+-- Default softtab (4)
 set.tabstop = 4
 set.softtabstop = 4
 set.shiftwidth = 4
diff --git a/nvim/lua/config/init.lua b/nvim/lua/config/init.lua
index 046cc51..df088b9 100644
--- a/nvim/lua/config/init.lua
+++ b/nvim/lua/config/init.lua
@@ -1,3 +1,3 @@
-require("config.base")
-require("config.keybinds")
+require("config.settings")
+require("config.mappings")
 require("config.indent")
diff --git a/nvim/lua/config/keybinds.lua b/nvim/lua/config/keybinds.lua
deleted file mode 100644
index f179ce3..0000000
--- a/nvim/lua/config/keybinds.lua
+++ /dev/null
@@ -1,41 +0,0 @@
--- Basic ones
-vim.g.mapleader = " "
-vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
-
-vim.keymap.set("i", "<C-z>", vim.cmd.undo)
-vim.keymap.set("i", "<C-y>", vim.cmd.redo)
-
--- Ctrl+s saves the current buffer in normal/insert mode.
-vim.keymap.set("n", "<C-s>", vim.cmd.w)
-vim.keymap.set("i", "<C-s>", vim.cmd.w)
-
--- Disable arrow keys (force me to use hjkl)
-
-vim.keymap.set("n", "<Up>", "", { noremap=true })
-vim.keymap.set("n", "<Down>", "", { noremap=true })
-vim.keymap.set("n", "<Left>", "", { noremap=true })
-vim.keymap.set("n", "<Right>", "", { noremap=true })
-
-vim.keymap.set("i", "<Up>", "", { noremap=true })
-vim.keymap.set("i", "<Down>", "", { noremap=true })
-vim.keymap.set("i", "<Left>", "", { noremap=true })
-vim.keymap.set("i", "<Right>", "", { noremap=true })
-
-vim.keymap.set("v", "<Up>", "", { noremap=true })
-vim.keymap.set("v", "<Down>", "", { noremap=true })
-vim.keymap.set("v", "<Left>", "", { noremap=true })
-vim.keymap.set("v", "<Right>", "", { noremap=true })
--- Move Text
---vim.keymap.set("n", "<S-a>", ":m+1<CR>")
---vim.keymap.set("v", "<S-d>", ":m-2<CR>")
-
---vim.keymap.set("v", "<S-a>", ":m+1<CR>")
---vim.keymap.set("n", "<S-d>", ":m-2<CR>")
-
--- Indent
-
--- Make Shift-Tab undo indent.
-vim.keymap.set("i", "<S-Tab>", "<C-d>")
-
--- NvimTree
-vim.keymap.set("n", "<leader>e", ":NvimTreeToggle<cr>", { noremap=true })
diff --git a/nvim/lua/config/mappings.lua b/nvim/lua/config/mappings.lua
new file mode 100644
index 0000000..6640a90
--- /dev/null
+++ b/nvim/lua/config/mappings.lua
@@ -0,0 +1,21 @@
+local map = vim.keymap.set
+local cmd = vim.cmd
+
+vim.g.mapleader = " "
+
+-- Undo/Redo in insert mode
+map("i", "<C-z>", cmd.undo)
+map("i", "<C-y>", cmd.redo)
+
+-- Ctrl+s saves the current buffer in normal/insert mode.
+map("n", "<C-s>", cmd.w)
+map("i", "<C-s>", cmd.w)
+
+-- Move Text
+map("n", "<S-a>", ":m+1<CR>")
+map("n", "<S-d>", ":m-2<CR>")
+
+-- Indent
+
+-- Make Shift-Tab undo indent.
+map("i", "<S-Tab>", "<C-d>")
diff --git a/nvim/lua/config/base.lua b/nvim/lua/config/settings.lua
similarity index 99%
rename from nvim/lua/config/base.lua
rename to nvim/lua/config/settings.lua
index b2442d4..8ec293e 100644
--- a/nvim/lua/config/base.lua
+++ b/nvim/lua/config/settings.lua
@@ -20,3 +20,4 @@ vim.opt.numberwidth = 6
 
 -- indent
 vim.opt.smartindent = true
+