diff --git a/config/cmder.lua b/vendor/cmder.lua
similarity index 92%
rename from config/cmder.lua
rename to vendor/cmder.lua
index 836540d3b..deea404fb 100644
--- a/config/cmder.lua
+++ b/vendor/cmder.lua
@@ -189,3 +189,13 @@ for _,lua_module in ipairs(clink.find_files(completions_dir..'*.lua')) do
         dofile(filename)
     end
 end
+
+-- now do the same for all lua files in config which do not start with '_'
+local user_config_dir = clink.get_env('CMDER_ROOT')..'\\config\\'
+for _,lua_module in ipairs(clink.find_files(user_config_dir..'*.lua')) do
+    -- Skip files that starts with _. This could be useful if some files should be ignored
+    if not string.match(lua_module, '^_.*') then
+        local filename = user_config_dir..lua_module
+        dofile(filename)
+    end
+end
diff --git a/vendor/init.bat b/vendor/init.bat
index 6f1455102..36b0a50d5 100644
--- a/vendor/init.bat
+++ b/vendor/init.bat
@@ -24,7 +24,7 @@
 )
 
 :: Run clink
-@"%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config"
+@"%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\vendor"
 
 :: Prepare for git-for-windows