diff --git a/.gitignore b/.gitignore
index f6d62f0..060f79b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 plugged/
-~/*
diff --git a/README.md b/README.md
index 0e2b178..896c563 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-# TODO
+# Neovim Config
 
-- [x] split panes Vertically
-- [x] navigate to/from terminal with keymapping
+## neovim version
+
+0.8.0
diff --git a/init.lua b/init.lua
deleted file mode 100644
index 01924b2..0000000
--- a/init.lua
+++ /dev/null
@@ -1,15 +0,0 @@
--- Base Configuration Files
-require(".settings")
-require(".packages")
-require(".keymapping")
-
--- Import Plugins
-require(".plugins.colortheme")
-require(".plugins.comment")
-require(".plugins.nvim-cmp-config")
-require(".plugins.lualine")
-require(".plugins.nvim-tree")
-require(".plugins.lsp.nullls")
-require(".plugins.lsp.saga")
-require(".plugins.lsp.mason")
-require(".plugins.lsp.servers")
diff --git a/init.vim b/init.vim
new file mode 100644
index 0000000..f73929b
--- /dev/null
+++ b/init.vim
@@ -0,0 +1,59 @@
+call plug#begin('~/.config/nvim/plugged')
+
+" General Dependency
+Plug 'nvim-lua/plenary.nvim' 
+
+" Colorscheme & Appearance
+Plug 'navarasu/onedark.nvim' 
+Plug 'nvim-lualine/lualine.nvim' 
+Plug 'nvim-tree/nvim-web-devicons' 
+
+" File Explorer
+Plug 'nvim-tree/nvim-tree.lua' 
+Plug 'nvim-telescope/telescope.nvim' 
+
+" Language Support
+Plug 'neovim/nvim-lspconfig' 
+Plug 'williamboman/mason.nvim' 
+Plug 'williamboman/mason-lspconfig.nvim' 
+Plug 'hrsh7th/nvim-cmp' 
+Plug 'hrsh7th/cmp-nvim-lsp' 
+Plug 'hrsh7th/cmp-buffer' 
+Plug 'hrsh7th/cmp-path' 
+Plug 'glepnir/lspsaga.nvim' 
+Plug 'jose-elias-alvarez/typescript.nvim' 
+Plug 'onsails/lspkind.nvim' 
+Plug 'jose-elias-alvarez/null-ls.nvim' 
+Plug 'jayp0521/mason-null-ls.nvim' 
+Plug 'L3MON4D3/LuaSnip' 
+Plug 'saadparwaiz1/cmp_luasnip' 
+Plug 'rafamadriz/friendly-snippets' 
+Plug 'nvim-treesitter/nvim-treesitter', { 'do': ':TSUpdate' }
+Plug 'windwp/nvim-autopairs' 
+Plug 'windwp/nvim-ts-autotag' 
+
+" Comments
+Plug 'numToStr/Comment.nvim' 
+
+" Window Management
+Plug 'szw/vim-maximizer' 
+
+call plug#end()
+
+" Base Configuration Files
+luafile ~/.config/nvim/settings.lua
+luafile ~/.config/nvim/keymapping.lua
+
+" Import Plugins
+luafile ~/.config/nvim/plugins/colortheme.lua
+luafile ~/.config/nvim/plugins/comment.lua
+luafile ~/.config/nvim/plugins/nvim-cmp-config.lua
+luafile ~/.config/nvim/plugins/lualine.lua
+luafile ~/.config/nvim/plugins/nvim-tree.lua
+luafile ~/.config/nvim/plugins/nvim-treesitter.lua
+luafile ~/.config/nvim/plugins/nvim-autopairs.lua
+luafile ~/.config/nvim/plugins/lsp/nullls.lua
+luafile ~/.config/nvim/plugins/lsp/saga.lua
+luafile ~/.config/nvim/plugins/lsp/mason.lua
+luafile ~/.config/nvim/plugins/lsp/servers.lua
+
diff --git a/packages.lua b/packages.lua
deleted file mode 100644
index e121f55..0000000
--- a/packages.lua
+++ /dev/null
@@ -1,41 +0,0 @@
-local Plug = vim.fn["plug#"]
-
-vim.call("plug#begin", "~/.config/nvim/plugged")
-
--- General Dependency
-Plug("nvim-lua/plenary.nvim")
-
--- Colorscheme & Appearance
-Plug("navarasu/onedark.nvim")
-Plug("nvim-lualine/lualine.nvim")
-Plug("nvim-tree/nvim-web-devicons")
-
--- File Explorer
-Plug("nvim-tree/nvim-tree.lua")
-Plug("nvim-telescope/telescope.nvim")
-
--- Language Support
-Plug("neovim/nvim-lspconfig")
-Plug("williamboman/mason.nvim")
-Plug("williamboman/mason-lspconfig.nvim")
-Plug("hrsh7th/nvim-cmp")
-Plug("hrsh7th/cmp-nvim-lsp")
-Plug("hrsh7th/cmp-buffer")
-Plug("hrsh7th/cmp-path")
-Plug("glepnir/lspsaga.nvim")
-Plug("jose-elias-alvarez/typescript.nvim")
-Plug("onsails/lspkind.nvim")
-Plug("jose-elias-alvarez/null-ls.nvim")
-Plug("jayp0521/mason-null-ls.nvim")
-Plug("L3MON4D3/LuaSnip")
-Plug("saadparwaiz1/cmp_luasnip")
-Plug("rafamadriz/friendly-snippets")
-Plug("windwp/nvim-autopairs")
-
--- Comments
-Plug("numToStr/Comment.nvim")
-
--- Window Management
-Plug("szw/vim-maximizer")
-
-vim.call("plug#end")
diff --git a/plugins/lsp/~/.vim/undodir/%home%rad%.config%nvim%plugins%lsp%servers.lua b/plugins/lsp/~/.vim/undodir/%home%rad%.config%nvim%plugins%lsp%servers.lua
deleted file mode 100644
index 72ec0fa..0000000
Binary files a/plugins/lsp/~/.vim/undodir/%home%rad%.config%nvim%plugins%lsp%servers.lua and /dev/null differ
diff --git a/plugins/nvim-autopairs.lua b/plugins/nvim-autopairs.lua
index 7faf5be..450502c 100644
--- a/plugins/nvim-autopairs.lua
+++ b/plugins/nvim-autopairs.lua
@@ -1 +1,15 @@
-require("nvim-autopairs").setup({})
+local autopairs = require("nvim-autopairs")
+
+autopairs.setup({
+	check_ts = true,
+	ts_config = {
+		lua = { "string" },
+		javascript = { "template_string" },
+		java = false,
+	},
+})
+
+local cmp_autopairs = require("nvim-autopairs.completion.cmp")
+local cmp = require("cmp")
+
+cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done())
diff --git a/plugins/nvim-treesitter.lua b/plugins/nvim-treesitter.lua
new file mode 100644
index 0000000..4243dbc
--- /dev/null
+++ b/plugins/nvim-treesitter.lua
@@ -0,0 +1,26 @@
+require("nvim-treesitter.configs").setup({
+	highlight = {
+		enable = true,
+	},
+	indent = {
+		enable = true,
+	},
+	autotag = {
+		enable = true,
+	},
+	ensure_installed = {
+		"json",
+		"javascript",
+		"typescript",
+		"yaml",
+		"html",
+		"css",
+		"markdown",
+		"bash",
+		"lua",
+		"dockerfile",
+		"gitignore",
+		"python",
+	},
+	auto_install = true,
+})