diff --git a/lua/autocmd.lua b/lua/autocmd.lua
index 322cfce..897febb 100644
--- a/lua/autocmd.lua
+++ b/lua/autocmd.lua
@@ -1,10 +1,5 @@
--- [[ Autocommands ]]
---  See `:help autocmd`
---  See `:help lua-guide-autocommands`
-
--- These should be self-explanatory
-vim.api.nvim_create_user_command('Cd', 'cd %:h', { desc = 'Change directory to the current file' })
-vim.api.nvim_create_user_command('Py', 'python %', { desc = 'Execute python file' })
+-- [[ Setting autocmd's ]]
+-- See `:help autocmd`
 
 -- Instantly move help window to the right
 -- This is almost certainly a hacky way to do this)
@@ -12,16 +7,3 @@ vim.api.nvim_create_autocmd('FileType', {
   pattern = { 'help' },
   command = 'wincmd L',
 })
-
--- Highlight when yanking (copying) text
---  Try it with `yap` in normal mode
---  See `:help vim.highlight.on_yank()`
-vim.api.nvim_create_autocmd('TextYankPost', {
-  desc = 'Highlight when yanking (copying) text',
-  group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }),
-  callback = function()
-    vim.highlight.on_yank()
-  end,
-})
-
--- vim: ts=2 sts=2 sw=2 et
diff --git a/lua/keymaps.lua b/lua/keymaps.lua
index bcfc338..adfa3c7 100644
--- a/lua/keymaps.lua
+++ b/lua/keymaps.lua
@@ -57,4 +57,18 @@ vim.keymap.set('v', '<A-k>', '<cmd>MoveBlock(-1)<CR>')
 vim.keymap.set('v', '<A-h>', '<cmd>MoveHBlock(-1)<CR>')
 vim.keymap.set('v', '<A-l>', '<cmd>MoveHBlock(1)<CR>')
 
+-- [[ Basic Autocommands ]]
+--  See `:help lua-guide-autocommands`
+
+-- Highlight when yanking (copying) text
+--  Try it with `yap` in normal mode
+--  See `:help vim.highlight.on_yank()`
+vim.api.nvim_create_autocmd('TextYankPost', {
+  desc = 'Highlight when yanking (copying) text',
+  group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }),
+  callback = function()
+    vim.highlight.on_yank()
+  end,
+})
+
 -- vim: ts=2 sts=2 sw=2 et