diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 14ba0ad1..73c8d858 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -13,11 +13,7 @@ if not vim.loop.fs_stat(lazypath) then
     }
 end
 vim.opt.rtp:prepend(lazypath)
-
 require("lazy").setup "plugins"
+
 -- Set vim options
-require "options"
--- Define custom keymappings
-require "keymaps"
--- Remaining vim commands to be converted to lua
-require "vimcommands"
+require "config"
diff --git a/config/nvim/lua/colours.lua b/config/nvim/lua/colours.lua
deleted file mode 100644
index e69de29b..00000000
diff --git a/config/nvim/lua/options.lua b/config/nvim/lua/config/init.lua
similarity index 95%
rename from config/nvim/lua/options.lua
rename to config/nvim/lua/config/init.lua
index 979f6abd..45617604 100644
--- a/config/nvim/lua/options.lua
+++ b/config/nvim/lua/config/init.lua
@@ -7,7 +7,6 @@ vim.g.python_indent = {
     continue = "shiftwidth()",
     closed_paren_align_last_line = "v:false",
 }
-vim.opt.termguicolors = true
 vim.opt.laststatus = 3
 vim.opt.mouse = "nv"
 vim.opt.shiftwidth = 4
@@ -23,3 +22,4 @@ vim.opt.autoindent = true
 vim.opt.smartindent = true
 vim.opt.splitbelow = true
 vim.opt.splitright = true
+require "config.keymaps"
diff --git a/config/nvim/lua/keymaps.lua b/config/nvim/lua/config/keymaps.lua
similarity index 100%
rename from config/nvim/lua/keymaps.lua
rename to config/nvim/lua/config/keymaps.lua
diff --git a/config/nvim/lua/plugins/catppuccin.lua b/config/nvim/lua/plugins/catppuccin.lua
index e0d1dd24..0e513185 100644
--- a/config/nvim/lua/plugins/catppuccin.lua
+++ b/config/nvim/lua/plugins/catppuccin.lua
@@ -4,6 +4,7 @@ return {
     lazy = false,
     priority = 1000,
     config = function()
+        vim.opt.termguicolors = true
         require "ui.fillchars"
         require("catppuccin").setup(require "ui.catppuccin_opts")
         vim.cmd "colorscheme catppuccin"
diff --git a/config/nvim/lua/vimcommands.lua b/config/nvim/lua/vimcommands.lua
deleted file mode 100644
index 42c7221c..00000000
--- a/config/nvim/lua/vimcommands.lua
+++ /dev/null
@@ -1,11 +0,0 @@
--- TODO convert to lua
-vim.cmd "let &t_ut=''" -- For kitty background colour support
-vim.cmd [[
-au BufRead,BufNewFile *.ipynb setlocal filetype=json
-au BufRead,BufNewFile *.md setlocal spell
-au BufRead,BufNewFile *.code-workspace setlocal filetype=json
-au BufRead,BufNewFile *.csv setlocal nowrap
-au BufRead,BufNewFile *.service[a-zA-Z0-9]* setlocal filetype=systemd
-au TermOpen * setlocal nonumber norelativenumber
-syntax on
-]]