From ca9e3a0af1e8855235836263ede8e6d7e7bb8dff Mon Sep 17 00:00:00 2001
From: Matt Leong <mattleong91@gmail.com>
Date: Mon, 29 Nov 2021 16:01:00 -0800
Subject: [PATCH] refactor: overhaul of organization, PLEASE RUN
 :CosmicReloadSync

---
 lua/cosmic/{ => core}/commands.lua            |  0
 lua/cosmic/{ => core}/disabled.lua            |  0
 lua/cosmic/{ => core}/editor.lua              |  0
 lua/cosmic/{ => core}/mappings.lua            |  8 +++----
 lua/cosmic/init.lua                           | 10 ++++-----
 lua/cosmic/lsp/diagnostics.lua                |  2 +-
 lua/cosmic/lsp/mappings.lua                   |  2 +-
 .../{core => modules}/dashboard/init.lua      |  2 +-
 lua/cosmic/{core => modules}/notify/init.lua  |  4 ++--
 .../{core => modules}/nvim-tree/init.lua      |  2 +-
 .../{core => modules}/nvim-tree/mappings.lua  |  0
 lua/cosmic/{core => modules}/session/init.lua |  0
 .../{core => modules}/session/mappings.lua    |  0
 .../{core => modules}/snippets/init.lua       |  0
 .../{core => modules}/statusline/init.lua     |  4 ++--
 .../{core => modules}/telescope/init.lua      |  2 +-
 .../{core => modules}/telescope/mappings.lua  |  2 +-
 .../{core => modules}/terminal/init.lua       |  0
 .../{core => modules}/terminal/mappings.lua   |  0
 .../{core => modules}/todo-comments/init.lua  |  2 +-
 .../{core => modules}/treesitter/init.lua     |  0
 lua/cosmic/pluginsInit.lua                    | 22 +++++++++----------
 lua/cosmic/{core => }/theme/colors.lua        |  4 ++--
 lua/cosmic/{core => }/theme/highlights.lua    |  2 +-
 lua/cosmic/{core => }/theme/icons.lua         |  0
 .../theme/integrated/catppuccin.lua           |  0
 .../{core => }/theme/integrated/dracula.lua   |  0
 .../{core => }/theme/integrated/enfocado.lua  |  0
 .../{core => }/theme/integrated/gruvbox.lua   |  0
 .../{core => }/theme/integrated/nightfox.lua  |  0
 .../{core => }/theme/integrated/nord.lua      |  0
 .../{core => }/theme/integrated/onedark.lua   |  0
 .../{core => }/theme/integrated/rose-pine.lua |  0
 .../theme/integrated/tokyonight.lua           |  0
 lua/cosmic/{core => }/theme/plugins.lua       |  0
 lua/cosmic/{core => }/theme/ui.lua            |  6 ++---
 lua/cosmic/utils/init.lua                     |  8 +++----
 readme.md                                     |  6 ++---
 38 files changed, 44 insertions(+), 44 deletions(-)
 rename lua/cosmic/{ => core}/commands.lua (100%)
 rename lua/cosmic/{ => core}/disabled.lua (100%)
 rename lua/cosmic/{ => core}/editor.lua (100%)
 rename lua/cosmic/{ => core}/mappings.lua (61%)
 rename lua/cosmic/{core => modules}/dashboard/init.lua (97%)
 rename lua/cosmic/{core => modules}/notify/init.lua (71%)
 rename lua/cosmic/{core => modules}/nvim-tree/init.lua (93%)
 rename lua/cosmic/{core => modules}/nvim-tree/mappings.lua (100%)
 rename lua/cosmic/{core => modules}/session/init.lua (100%)
 rename lua/cosmic/{core => modules}/session/mappings.lua (100%)
 rename lua/cosmic/{core => modules}/snippets/init.lua (100%)
 rename lua/cosmic/{core => modules}/statusline/init.lua (99%)
 rename lua/cosmic/{core => modules}/telescope/init.lua (98%)
 rename lua/cosmic/{core => modules}/telescope/mappings.lua (90%)
 rename lua/cosmic/{core => modules}/terminal/init.lua (100%)
 rename lua/cosmic/{core => modules}/terminal/mappings.lua (100%)
 rename lua/cosmic/{core => modules}/todo-comments/init.lua (95%)
 rename lua/cosmic/{core => modules}/treesitter/init.lua (100%)
 rename lua/cosmic/{core => }/theme/colors.lua (66%)
 rename lua/cosmic/{core => }/theme/highlights.lua (97%)
 rename lua/cosmic/{core => }/theme/icons.lua (100%)
 rename lua/cosmic/{core => }/theme/integrated/catppuccin.lua (100%)
 rename lua/cosmic/{core => }/theme/integrated/dracula.lua (100%)
 rename lua/cosmic/{core => }/theme/integrated/enfocado.lua (100%)
 rename lua/cosmic/{core => }/theme/integrated/gruvbox.lua (100%)
 rename lua/cosmic/{core => }/theme/integrated/nightfox.lua (100%)
 rename lua/cosmic/{core => }/theme/integrated/nord.lua (100%)
 rename lua/cosmic/{core => }/theme/integrated/onedark.lua (100%)
 rename lua/cosmic/{core => }/theme/integrated/rose-pine.lua (100%)
 rename lua/cosmic/{core => }/theme/integrated/tokyonight.lua (100%)
 rename lua/cosmic/{core => }/theme/plugins.lua (100%)
 rename lua/cosmic/{core => }/theme/ui.lua (93%)

diff --git a/lua/cosmic/commands.lua b/lua/cosmic/core/commands.lua
similarity index 100%
rename from lua/cosmic/commands.lua
rename to lua/cosmic/core/commands.lua
diff --git a/lua/cosmic/disabled.lua b/lua/cosmic/core/disabled.lua
similarity index 100%
rename from lua/cosmic/disabled.lua
rename to lua/cosmic/core/disabled.lua
diff --git a/lua/cosmic/editor.lua b/lua/cosmic/core/editor.lua
similarity index 100%
rename from lua/cosmic/editor.lua
rename to lua/cosmic/core/editor.lua
diff --git a/lua/cosmic/mappings.lua b/lua/cosmic/core/mappings.lua
similarity index 61%
rename from lua/cosmic/mappings.lua
rename to lua/cosmic/core/mappings.lua
index d0b31d7..002a343 100644
--- a/lua/cosmic/mappings.lua
+++ b/lua/cosmic/core/mappings.lua
@@ -9,8 +9,8 @@ map('n', '<leader>cf', ':cfdo %s/')
 -- make Y behave like others
 map('n', 'Y', 'y$')
 
-require('cosmic.core.session.mappings')
-require('cosmic.core.telescope.mappings').init()
-require('cosmic.core.nvim-tree.mappings')
-require('cosmic.core.terminal.mappings')
+require('cosmic.modules.session.mappings')
+require('cosmic.modules.telescope.mappings').init()
+require('cosmic.modules.nvim-tree.mappings')
+require('cosmic.modules.terminal.mappings')
 require('cosmic.lsp.mappings')
diff --git a/lua/cosmic/init.lua b/lua/cosmic/init.lua
index 8dcb155..d29ca88 100644
--- a/lua/cosmic/init.lua
+++ b/lua/cosmic/init.lua
@@ -1,13 +1,13 @@
 local cosmic_modules = {
   'cosmic.compiled',
-  'cosmic.disabled',
+  'cosmic.core.disabled',
   'cosmic.pluginsInit',
-  'cosmic.commands',
-  'cosmic.editor',
+  'cosmic.core.commands',
+  'cosmic.core.editor',
   'cosmic.config.editor',
-  'cosmic.mappings',
+  'cosmic.core.mappings',
   'cosmic.config.mappings',
-  'cosmic.core.theme.highlights',
+  'cosmic.theme.highlights',
 }
 
 for _, mod in ipairs(cosmic_modules) do
diff --git a/lua/cosmic/lsp/diagnostics.lua b/lua/cosmic/lsp/diagnostics.lua
index 3895fc9..76b02d0 100644
--- a/lua/cosmic/lsp/diagnostics.lua
+++ b/lua/cosmic/lsp/diagnostics.lua
@@ -1,5 +1,5 @@
 local config = require('cosmic.config')
-local icons = require('cosmic.core.theme.icons')
+local icons = require('cosmic.theme.icons')
 
 local defaults = {
   underline = true,
diff --git a/lua/cosmic/lsp/mappings.lua b/lua/cosmic/lsp/mappings.lua
index e64c5f0..1fe96bb 100644
--- a/lua/cosmic/lsp/mappings.lua
+++ b/lua/cosmic/lsp/mappings.lua
@@ -8,7 +8,7 @@ map('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<cr>')
 map('n', 'gi', '<cmd>lua require("telescope.builtin").lsp_implementations()<cr>')
 map('n', 'gt', '<cmd>lua require("telescope.builtin").lsp_type_definitions()<cr>')
 map('n', 'gr', '<cmd>lua require("telescope.builtin").lsp_references()<cr>')
-map('n', 'gn', '<cmd>lua require("cosmic.core.theme.ui").rename()<cr>')
+map('n', 'gn', '<cmd>lua require("cosmic.theme.ui").rename()<cr>')
 
 -- diagnostics
 map('n', '[g', '<cmd>lua vim.diagnostic.goto_prev()<cr>')
diff --git a/lua/cosmic/core/dashboard/init.lua b/lua/cosmic/modules/dashboard/init.lua
similarity index 97%
rename from lua/cosmic/core/dashboard/init.lua
rename to lua/cosmic/modules/dashboard/init.lua
index d950c6e..3712f30 100644
--- a/lua/cosmic/core/dashboard/init.lua
+++ b/lua/cosmic/modules/dashboard/init.lua
@@ -1,4 +1,4 @@
-local icons = require('cosmic.core.theme.icons')
+local icons = require('cosmic.theme.icons')
 local g = vim.g
 
 g.dashboard_custom_header = {
diff --git a/lua/cosmic/core/notify/init.lua b/lua/cosmic/modules/notify/init.lua
similarity index 71%
rename from lua/cosmic/core/notify/init.lua
rename to lua/cosmic/modules/notify/init.lua
index d3dd1da..6355320 100644
--- a/lua/cosmic/core/notify/init.lua
+++ b/lua/cosmic/modules/notify/init.lua
@@ -1,4 +1,4 @@
-local icons = require('cosmic.core.theme.icons')
+local icons = require('cosmic.theme.icons')
 local config = require('cosmic.config')
 
 require('notify').setup(vim.tbl_deep_extend('force', {
@@ -9,6 +9,6 @@ require('notify').setup(vim.tbl_deep_extend('force', {
     DEBUG = icons.debug,
     TRACE = icons.trace,
   },
-  background_colour = require('cosmic.core.theme.colors').notify_bg,
+  background_colour = require('cosmic.theme.colors').notify_bg,
 }, config.notify or {}))
 vim.notify = require('notify')
diff --git a/lua/cosmic/core/nvim-tree/init.lua b/lua/cosmic/modules/nvim-tree/init.lua
similarity index 93%
rename from lua/cosmic/core/nvim-tree/init.lua
rename to lua/cosmic/modules/nvim-tree/init.lua
index d05f9fc..5f2833f 100644
--- a/lua/cosmic/core/nvim-tree/init.lua
+++ b/lua/cosmic/modules/nvim-tree/init.lua
@@ -1,5 +1,5 @@
 local g = vim.g
-local icons = require('cosmic.core.theme.icons')
+local icons = require('cosmic.theme.icons')
 local config = require('cosmic.config')
 
 -- settings
diff --git a/lua/cosmic/core/nvim-tree/mappings.lua b/lua/cosmic/modules/nvim-tree/mappings.lua
similarity index 100%
rename from lua/cosmic/core/nvim-tree/mappings.lua
rename to lua/cosmic/modules/nvim-tree/mappings.lua
diff --git a/lua/cosmic/core/session/init.lua b/lua/cosmic/modules/session/init.lua
similarity index 100%
rename from lua/cosmic/core/session/init.lua
rename to lua/cosmic/modules/session/init.lua
diff --git a/lua/cosmic/core/session/mappings.lua b/lua/cosmic/modules/session/mappings.lua
similarity index 100%
rename from lua/cosmic/core/session/mappings.lua
rename to lua/cosmic/modules/session/mappings.lua
diff --git a/lua/cosmic/core/snippets/init.lua b/lua/cosmic/modules/snippets/init.lua
similarity index 100%
rename from lua/cosmic/core/snippets/init.lua
rename to lua/cosmic/modules/snippets/init.lua
diff --git a/lua/cosmic/core/statusline/init.lua b/lua/cosmic/modules/statusline/init.lua
similarity index 99%
rename from lua/cosmic/core/statusline/init.lua
rename to lua/cosmic/modules/statusline/init.lua
index d048582..82b79d3 100644
--- a/lua/cosmic/core/statusline/init.lua
+++ b/lua/cosmic/modules/statusline/init.lua
@@ -4,9 +4,9 @@ local diag = require('galaxyline.providers.diagnostic')
 local condition = require('galaxyline.condition')
 local fileinfo = require('galaxyline.providers.fileinfo')
 local utils = require('cosmic.utils')
-local colors = require('cosmic.core.theme.colors')
+local colors = require('cosmic.theme.colors')
 local highlight = utils.highlight
-local icons = require('cosmic.core.theme.icons')
+local icons = require('cosmic.theme.icons')
 local config = require('cosmic.config')
 
 local defaults = vim.tbl_deep_extend('force', {
diff --git a/lua/cosmic/core/telescope/init.lua b/lua/cosmic/modules/telescope/init.lua
similarity index 98%
rename from lua/cosmic/core/telescope/init.lua
rename to lua/cosmic/modules/telescope/init.lua
index fd2aafe..6417717 100644
--- a/lua/cosmic/core/telescope/init.lua
+++ b/lua/cosmic/modules/telescope/init.lua
@@ -1,5 +1,5 @@
 local actions = require('telescope.actions')
-local icons = require('cosmic.core.theme.icons')
+local icons = require('cosmic.theme.icons')
 local config = require('cosmic.config')
 
 local default_mappings = {
diff --git a/lua/cosmic/core/telescope/mappings.lua b/lua/cosmic/modules/telescope/mappings.lua
similarity index 90%
rename from lua/cosmic/core/telescope/mappings.lua
rename to lua/cosmic/modules/telescope/mappings.lua
index 2080148..818eda7 100644
--- a/lua/cosmic/core/telescope/mappings.lua
+++ b/lua/cosmic/modules/telescope/mappings.lua
@@ -11,7 +11,7 @@ end
 
 M.init = function()
   -- navigation
-  map('n', '<leader>ff', '<cmd>lua require("cosmic.core.telescope.mappings").project_files()<cr>')
+  map('n', '<leader>ff', '<cmd>lua require("cosmic.modules.telescope.mappings").project_files()<cr>')
   map('n', '<leader>fp', ':Telescope find_files<cr>')
   map('n', '<leader>fk', ':Telescope buffers<cr>')
   map('n', '<leader>fs', ':Telescope live_grep<cr>')
diff --git a/lua/cosmic/core/terminal/init.lua b/lua/cosmic/modules/terminal/init.lua
similarity index 100%
rename from lua/cosmic/core/terminal/init.lua
rename to lua/cosmic/modules/terminal/init.lua
diff --git a/lua/cosmic/core/terminal/mappings.lua b/lua/cosmic/modules/terminal/mappings.lua
similarity index 100%
rename from lua/cosmic/core/terminal/mappings.lua
rename to lua/cosmic/modules/terminal/mappings.lua
diff --git a/lua/cosmic/core/todo-comments/init.lua b/lua/cosmic/modules/todo-comments/init.lua
similarity index 95%
rename from lua/cosmic/core/todo-comments/init.lua
rename to lua/cosmic/modules/todo-comments/init.lua
index c3a45e1..0c4a98b 100644
--- a/lua/cosmic/core/todo-comments/init.lua
+++ b/lua/cosmic/modules/todo-comments/init.lua
@@ -1,4 +1,4 @@
-local icons = require('cosmic.core.theme.icons')
+local icons = require('cosmic.theme.icons')
 local config = require('cosmic.config')
 
 require('todo-comments').setup(vim.tbl_deep_extend('force', {
diff --git a/lua/cosmic/core/treesitter/init.lua b/lua/cosmic/modules/treesitter/init.lua
similarity index 100%
rename from lua/cosmic/core/treesitter/init.lua
rename to lua/cosmic/modules/treesitter/init.lua
diff --git a/lua/cosmic/pluginsInit.lua b/lua/cosmic/pluginsInit.lua
index b135fa6..8dfc656 100644
--- a/lua/cosmic/pluginsInit.lua
+++ b/lua/cosmic/pluginsInit.lua
@@ -33,12 +33,12 @@ return packer.startup(function()
   })
 
   -- initialize theme plugins
-  require('cosmic.core.theme.plugins').init(use, config)
+  require('cosmic.theme.plugins').init(use, config)
 
   use({
     'rcarriga/nvim-notify',
     config = function()
-      require('cosmic.core.notify')
+      require('cosmic.modules.notify')
     end,
     after = config.theme,
     disable = vim.tbl_contains(user_plugins.disable, 'notify'),
@@ -50,7 +50,7 @@ return packer.startup(function()
     branch = 'main',
     requires = { 'kyazdani42/nvim-web-devicons', opt = true },
     config = function()
-      require('cosmic.core.statusline')
+      require('cosmic.modules.statusline')
     end,
     after = config.theme,
     disable = vim.tbl_contains(user_plugins.disable, 'statusline'),
@@ -60,7 +60,7 @@ return packer.startup(function()
   use({
     'kyazdani42/nvim-tree.lua',
     config = function()
-      require('cosmic.core.nvim-tree')
+      require('cosmic.modules.nvim-tree')
     end,
     opt = true,
     cmd = {
@@ -140,7 +140,7 @@ return packer.startup(function()
   use({
     'L3MON4D3/LuaSnip',
     config = function()
-      require('cosmic.core.snippets')
+      require('cosmic.modules.snippets')
     end,
     requires = {
       'rafamadriz/friendly-snippets',
@@ -174,7 +174,7 @@ return packer.startup(function()
     opt = true,
     cmd = { 'FloatermToggle', 'FloatermNew', 'FloatermSend' },
     config = function()
-      require('cosmic.core.terminal')
+      require('cosmic.modules.terminal')
     end,
     disable = vim.tbl_contains(user_plugins.disable, 'terminal'),
   })
@@ -191,7 +191,7 @@ return packer.startup(function()
       },
     },
     config = function()
-      require('cosmic.core.telescope')
+      require('cosmic.modules.telescope')
     end,
     event = 'BufWinEnter',
     disable = vim.tbl_contains(user_plugins.disable, 'telescope'),
@@ -201,7 +201,7 @@ return packer.startup(function()
   use({
     'glepnir/dashboard-nvim',
     config = function()
-      require('cosmic.core.dashboard')
+      require('cosmic.modules.dashboard')
     end,
     disable = vim.tbl_contains(user_plugins.disable, 'dashboard'),
   })
@@ -210,7 +210,7 @@ return packer.startup(function()
     'rmagatti/auto-session',
     event = 'VimEnter',
     config = function()
-      require('cosmic.core.session')
+      require('cosmic.modules.session')
     end,
     disable = vim.tbl_contains(user_plugins.disable, 'auto-session'),
   })
@@ -225,7 +225,7 @@ return packer.startup(function()
     },
     run = ':TSUpdate',
     config = function()
-      require('cosmic.core.treesitter')
+      require('cosmic.modules.treesitter')
     end,
     disable = vim.tbl_contains(user_plugins.disable, 'treesitter'),
   })
@@ -242,7 +242,7 @@ return packer.startup(function()
     'folke/todo-comments.nvim',
     requires = 'nvim-lua/plenary.nvim',
     config = function()
-      require('cosmic.core.todo-comments')
+      require('cosmic.modules.todo-comments')
     end,
     event = 'BufWinEnter',
     disable = vim.tbl_contains(user_plugins.disable, 'todo-comments'),
diff --git a/lua/cosmic/core/theme/colors.lua b/lua/cosmic/theme/colors.lua
similarity index 66%
rename from lua/cosmic/core/theme/colors.lua
rename to lua/cosmic/theme/colors.lua
index 54084b1..28ec3f2 100644
--- a/lua/cosmic/core/theme/colors.lua
+++ b/lua/cosmic/theme/colors.lua
@@ -1,7 +1,7 @@
 local config = require('cosmic.config')
 local colors = {}
-local mod = 'cosmic.core.theme.integrated.'
-local supported_themes = require('cosmic.core.theme.plugins').supported_themes
+local mod = 'cosmic.theme.integrated.'
+local supported_themes = require('cosmic.theme.plugins').supported_themes
 
 for _, theme in pairs(supported_themes) do
   if theme == config.theme then
diff --git a/lua/cosmic/core/theme/highlights.lua b/lua/cosmic/theme/highlights.lua
similarity index 97%
rename from lua/cosmic/core/theme/highlights.lua
rename to lua/cosmic/theme/highlights.lua
index ea6c0b0..d3b2af5 100644
--- a/lua/cosmic/core/theme/highlights.lua
+++ b/lua/cosmic/theme/highlights.lua
@@ -1,4 +1,4 @@
-local _, colors = pcall(require, 'cosmic.core.theme.colors')
+local _, colors = pcall(require, 'cosmic.theme.colors')
 if not colors then
   return
 end
diff --git a/lua/cosmic/core/theme/icons.lua b/lua/cosmic/theme/icons.lua
similarity index 100%
rename from lua/cosmic/core/theme/icons.lua
rename to lua/cosmic/theme/icons.lua
diff --git a/lua/cosmic/core/theme/integrated/catppuccin.lua b/lua/cosmic/theme/integrated/catppuccin.lua
similarity index 100%
rename from lua/cosmic/core/theme/integrated/catppuccin.lua
rename to lua/cosmic/theme/integrated/catppuccin.lua
diff --git a/lua/cosmic/core/theme/integrated/dracula.lua b/lua/cosmic/theme/integrated/dracula.lua
similarity index 100%
rename from lua/cosmic/core/theme/integrated/dracula.lua
rename to lua/cosmic/theme/integrated/dracula.lua
diff --git a/lua/cosmic/core/theme/integrated/enfocado.lua b/lua/cosmic/theme/integrated/enfocado.lua
similarity index 100%
rename from lua/cosmic/core/theme/integrated/enfocado.lua
rename to lua/cosmic/theme/integrated/enfocado.lua
diff --git a/lua/cosmic/core/theme/integrated/gruvbox.lua b/lua/cosmic/theme/integrated/gruvbox.lua
similarity index 100%
rename from lua/cosmic/core/theme/integrated/gruvbox.lua
rename to lua/cosmic/theme/integrated/gruvbox.lua
diff --git a/lua/cosmic/core/theme/integrated/nightfox.lua b/lua/cosmic/theme/integrated/nightfox.lua
similarity index 100%
rename from lua/cosmic/core/theme/integrated/nightfox.lua
rename to lua/cosmic/theme/integrated/nightfox.lua
diff --git a/lua/cosmic/core/theme/integrated/nord.lua b/lua/cosmic/theme/integrated/nord.lua
similarity index 100%
rename from lua/cosmic/core/theme/integrated/nord.lua
rename to lua/cosmic/theme/integrated/nord.lua
diff --git a/lua/cosmic/core/theme/integrated/onedark.lua b/lua/cosmic/theme/integrated/onedark.lua
similarity index 100%
rename from lua/cosmic/core/theme/integrated/onedark.lua
rename to lua/cosmic/theme/integrated/onedark.lua
diff --git a/lua/cosmic/core/theme/integrated/rose-pine.lua b/lua/cosmic/theme/integrated/rose-pine.lua
similarity index 100%
rename from lua/cosmic/core/theme/integrated/rose-pine.lua
rename to lua/cosmic/theme/integrated/rose-pine.lua
diff --git a/lua/cosmic/core/theme/integrated/tokyonight.lua b/lua/cosmic/theme/integrated/tokyonight.lua
similarity index 100%
rename from lua/cosmic/core/theme/integrated/tokyonight.lua
rename to lua/cosmic/theme/integrated/tokyonight.lua
diff --git a/lua/cosmic/core/theme/plugins.lua b/lua/cosmic/theme/plugins.lua
similarity index 100%
rename from lua/cosmic/core/theme/plugins.lua
rename to lua/cosmic/theme/plugins.lua
diff --git a/lua/cosmic/core/theme/ui.lua b/lua/cosmic/theme/ui.lua
similarity index 93%
rename from lua/cosmic/core/theme/ui.lua
rename to lua/cosmic/theme/ui.lua
index 0c01f74..e5bb56f 100644
--- a/lua/cosmic/core/theme/ui.lua
+++ b/lua/cosmic/theme/ui.lua
@@ -5,7 +5,7 @@ local lsp = vim.lsp
 local buf, win
 
 function M.rename()
-  local icons = require('cosmic.core.theme.icons')
+  local icons = require('cosmic.theme.icons')
   local utils = require('cosmic.utils')
   local config = require('cosmic.config')
   local Logger = require('cosmic.utils.logger')
@@ -30,7 +30,7 @@ function M.rename()
   api.nvim_buf_set_option(buf, 'modifiable', true)
   api.nvim_buf_set_option(buf, 'buftype', 'prompt')
 
-  local _, colors = pcall(require, 'cosmic.core.theme.colors')
+  local _, colors = pcall(require, 'cosmic.theme.colors')
   if colors then
     api.nvim_buf_add_highlight(buf, -1, 'LspRenamePrompt', 0, 0, #prompt_str)
     highlight('LspRenamePrompt', 'None', colors.selection_caret)
@@ -44,7 +44,7 @@ function M.rename()
     buf,
     'i',
     '<CR>',
-    "<CMD>stopinsert <BAR> lua require('cosmic.core.theme.ui')._rename()<CR>",
+    "<CMD>stopinsert <BAR> lua require('cosmic.theme.ui')._rename()<CR>",
     map_opts
   )
 
diff --git a/lua/cosmic/utils/init.lua b/lua/cosmic/utils/init.lua
index fa59e20..2e78d46 100644
--- a/lua/cosmic/utils/init.lua
+++ b/lua/cosmic/utils/init.lua
@@ -74,9 +74,9 @@ end
 
 function M.post_reload(msg)
   unload('cosmic.utils', true)
-  unload('cosmic.core.theme.colors', true)
-  unload('cosmic.core.theme.highlights', true)
-  unload('cosmic.core.statusline', true)
+  unload('cosmic.theme.colors', true)
+  unload('cosmic.theme.highlights', true)
+  unload('cosmic.modules.statusline', true)
   msg = msg or 'User config reloaded!'
   Logger:log(msg)
 end
@@ -85,7 +85,7 @@ function M.reload_user_config_sync()
   M.reload_user_config()
   clear_cache()
   unload('cosmic.config', true)
-  unload('cosmic.pluginsInit', true)
+  unload('cosmic.modulesInit', true)
   vim.cmd([[autocmd User PackerCompileDone ++once lua require('cosmic.utils').post_reload()]])
   vim.cmd(':PackerSync')
 end
diff --git a/readme.md b/readme.md
index 0ac916d..28fcae3 100644
--- a/readme.md
+++ b/readme.md
@@ -128,11 +128,11 @@ Useful for non-plugin related changes such as editor settings or mappings.
 
 ## 🗺 Default Mappings
 
-[File navigation](./lua/cosmic/core/telescope/mappings.lua)
+[File navigation](./lua/cosmic/modules/telescope/mappings.lua)
 
-[File explorer](./lua/cosmic/core/nvim-tree/mappings.lua)
+[File explorer](./lua/cosmic/modules/nvim-tree/mappings.lua)
 
-[Terminal](./lua/cosmic/core/terminal/mappings.lua)
+[Terminal](./lua/cosmic/modules/terminal/mappings.lua)
 
 [LSP](./lua/cosmic/lsp/mappings.lua)