diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 9d5204f..f21567a 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1,9 +1,9 @@
 -- Blake's neovim rc file
 
--- basic settings: ~/.config/nvim/lua/settings.lua
-require('settings')
--- plugins and plugin settings: ~/.config/nvim/lua/plugins.lua
-require('plugins')
+-- basic settings: ~/.config/nvim/lua/blake/settings.lua
+require('blake.settings')
+-- plugins and plugin settings: ~/.config/nvim/lua/blake/plugins.lua
+require('blake.plugins')
 
 -- TODO:
 --
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/blake/lsp.lua
similarity index 100%
rename from .config/nvim/lua/lsp.lua
rename to .config/nvim/lua/blake/lsp.lua
diff --git a/.config/nvim/lua/other.lua b/.config/nvim/lua/blake/other.lua
similarity index 100%
rename from .config/nvim/lua/other.lua
rename to .config/nvim/lua/blake/other.lua
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/blake/plugins.lua
similarity index 90%
rename from .config/nvim/lua/plugins.lua
rename to .config/nvim/lua/blake/plugins.lua
index 871e342..20f1bcf 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/blake/plugins.lua
@@ -18,7 +18,7 @@ return require('packer').startup(function()
    use {                                           -- syntax highlighting
       'nvim-treesitter/nvim-treesitter', run = ':TSUpdate',
       config = function()
-         require("lsp").treesitter()
+         require("blake.lsp").treesitter()
       end,
    } 
    use {                                           -- onedark theme
@@ -38,7 +38,7 @@ return require('packer').startup(function()
       "kabouzeid/nvim-lspinstall",
       -- opt = true,
       -- setup = function()
-      --    require("other").packer_lazy_load "nvim-lspinstall"
+      --    require("blake.other").packer_lazy_load "nvim-lspinstall"
       --    -- reload the current file so lsp actually starts for it
       --    vim.defer_fn(function()
       --       vim.cmd "silent! e %"
@@ -48,20 +48,20 @@ return require('packer').startup(function()
    use {                                           -- DAP: Debug Adapter Protocol
       "mfussenegger/nvim-dap",
       config = function()
-         require("lsp").dap()
+         require("blake.lsp").dap()
       end
    }
    use {                                     -- DAP adapter installer
       "Pocco81/DAPInstall.nvim",
       config = function()
-         require("lsp").dapinstall()
+         require("blake.lsp").dapinstall()
       end
    }
    use {                                           -- Default LSP configs
       "neovim/nvim-lspconfig",
       after = "nvim-lspinstall",
       config = function()
-         require("lsp").lspconfig()
+         require("blake.lsp").lspconfig()
       end
    }
    use {                                           -- Icons for each entry in the completion menu
@@ -70,7 +70,7 @@ return require('packer').startup(function()
    use {                                           -- compe
       "hrsh7th/nvim-cmp",
       config = function()
-         require('lsp').cmp()
+         require('blake.lsp').cmp()
       end,
       requires = { -- nvim-cmp sources
          -- "saadparwaiz1/cmp_luasnip", --luasnip integration
@@ -93,13 +93,13 @@ return require('packer').startup(function()
       "ray-x/lsp_signature.nvim",
       after = "nvim-lspconfig",
       config = function()
-         require("lsp").signature()
+         require("blake.lsp").signature()
       end,
    }
    use {                                           -- Use the % key for more things
       "andymass/vim-matchup",
       -- setup = function()
-      --    require("other").packer_lazy_load "vim-matchup"
+      --    require("blake.other").packer_lazy_load "vim-matchup"
       -- end,
    }
    use {                                           -- ALE: Support for lots of linters, etc
@@ -117,32 +117,32 @@ return require('packer').startup(function()
          'nvim-lua/plenary.nvim'
       },
       config = function()
-         require('other').gitsigns()
+         require('blake.other').gitsigns()
       end,
    }
    use {                                           -- file manager
       'kyazdani42/nvim-tree.lua',
       requires = 'kyazdani42/nvim-web-devicons',
       config = function()
-         require('other').nvimtree()
+         require('blake.other').nvimtree()
       end
    }
    use {                                           -- terminal
       "akinsho/toggleterm.nvim",
       config = function()
-         require('other').toggleterm()
+         require('blake.other').toggleterm()
       end
    }
    use {                                           -- Smooth Scrolling
       "karb94/neoscroll.nvim",
       config = function()
-         require('other').neoscroll()
+         require('blake.other').neoscroll()
       end,
    }
    use {                                           -- automatic session management
       'rmagatti/auto-session',
       config = function()
-         require('other').autosession()
+         require('blake.other').autosession()
       end
    }
    use {                                           -- Markdown preview
diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/blake/settings.lua
similarity index 100%
rename from .config/nvim/lua/settings.lua
rename to .config/nvim/lua/blake/settings.lua