diff --git a/lua/cosmic/core/init.lua b/lua/cosmic/core/init.lua
new file mode 100644
index 0000000..73936b5
--- /dev/null
+++ b/lua/cosmic/core/init.lua
@@ -0,0 +1,16 @@
+local cosmic_modules = {
+  'cosmic.core.disabled',
+  'cosmic.core.pluginsInit',
+  'cosmic.core.commands',
+  'cosmic.core.editor',
+  'cosmic.config.editor',
+  'cosmic.core.mappings',
+  'cosmic.config.mappings',
+}
+
+for _, mod in ipairs(cosmic_modules) do
+  local ok, err = pcall(require, mod)
+  if not ok and not mod:find('cosmic.config') then
+    error(('Error loading %s...\n\n%s'):format(mod, err))
+  end
+end
diff --git a/lua/cosmic/pluginsInit.lua b/lua/cosmic/core/pluginsInit.lua
similarity index 100%
rename from lua/cosmic/pluginsInit.lua
rename to lua/cosmic/core/pluginsInit.lua
diff --git a/lua/cosmic/init.lua b/lua/cosmic/init.lua
index d29ca88..1f6ae4b 100644
--- a/lua/cosmic/init.lua
+++ b/lua/cosmic/init.lua
@@ -1,13 +1,7 @@
 local cosmic_modules = {
   'cosmic.compiled',
-  'cosmic.core.disabled',
-  'cosmic.pluginsInit',
-  'cosmic.core.commands',
-  'cosmic.core.editor',
-  'cosmic.config.editor',
-  'cosmic.core.mappings',
-  'cosmic.config.mappings',
-  'cosmic.theme.highlights',
+  'cosmic.core',
+  'cosmic.theme',
 }
 
 for _, mod in ipairs(cosmic_modules) do
diff --git a/lua/cosmic/theme/highlights.lua b/lua/cosmic/theme/init.lua
similarity index 100%
rename from lua/cosmic/theme/highlights.lua
rename to lua/cosmic/theme/init.lua
diff --git a/lua/cosmic/utils/init.lua b/lua/cosmic/utils/init.lua
index 2e78d46..1ce5b6c 100644
--- a/lua/cosmic/utils/init.lua
+++ b/lua/cosmic/utils/init.lua
@@ -74,8 +74,7 @@ end
 
 function M.post_reload(msg)
   unload('cosmic.utils', true)
-  unload('cosmic.theme.colors', true)
-  unload('cosmic.theme.highlights', true)
+  unload('cosmic.theme', true)
   unload('cosmic.modules.statusline', true)
   msg = msg or 'User config reloaded!'
   Logger:log(msg)
@@ -85,7 +84,7 @@ function M.reload_user_config_sync()
   M.reload_user_config()
   clear_cache()
   unload('cosmic.config', true)
-  unload('cosmic.modulesInit', true)
+  unload('cosmic.core.pluginsInit', true)
   vim.cmd([[autocmd User PackerCompileDone ++once lua require('cosmic.utils').post_reload()]])
   vim.cmd(':PackerSync')
 end