diff --git a/lualibs/lua.exe b/bin/lua.exe
similarity index 100%
rename from lualibs/lua.exe
rename to bin/lua.exe
diff --git a/lualibs/lua5.1.dll b/bin/lua5.1.dll
similarity index 100%
rename from lualibs/lua5.1.dll
rename to bin/lua5.1.dll
diff --git a/lualibs/wx/wxbase28_net_vc_custom.dll b/bin/wxbase28_net_vc_custom.dll
similarity index 100%
rename from lualibs/wx/wxbase28_net_vc_custom.dll
rename to bin/wxbase28_net_vc_custom.dll
diff --git a/lualibs/wx/wxbase28_vc_custom.dll b/bin/wxbase28_vc_custom.dll
similarity index 100%
rename from lualibs/wx/wxbase28_vc_custom.dll
rename to bin/wxbase28_vc_custom.dll
diff --git a/lualibs/wx/wxbase28_xml_vc_custom.dll b/bin/wxbase28_xml_vc_custom.dll
similarity index 100%
rename from lualibs/wx/wxbase28_xml_vc_custom.dll
rename to bin/wxbase28_xml_vc_custom.dll
diff --git a/lualibs/wx/wxmsw28_adv_vc_custom.dll b/bin/wxmsw28_adv_vc_custom.dll
similarity index 100%
rename from lualibs/wx/wxmsw28_adv_vc_custom.dll
rename to bin/wxmsw28_adv_vc_custom.dll
diff --git a/lualibs/wx/wxmsw28_aui_vc_custom.dll b/bin/wxmsw28_aui_vc_custom.dll
similarity index 100%
rename from lualibs/wx/wxmsw28_aui_vc_custom.dll
rename to bin/wxmsw28_aui_vc_custom.dll
diff --git a/lualibs/wx/wxmsw28_core_vc_custom.dll b/bin/wxmsw28_core_vc_custom.dll
similarity index 100%
rename from lualibs/wx/wxmsw28_core_vc_custom.dll
rename to bin/wxmsw28_core_vc_custom.dll
diff --git a/lualibs/wx/wxmsw28_gl_vc_custom.dll b/bin/wxmsw28_gl_vc_custom.dll
similarity index 100%
rename from lualibs/wx/wxmsw28_gl_vc_custom.dll
rename to bin/wxmsw28_gl_vc_custom.dll
diff --git a/lualibs/wx/wxmsw28_html_vc_custom.dll b/bin/wxmsw28_html_vc_custom.dll
similarity index 100%
rename from lualibs/wx/wxmsw28_html_vc_custom.dll
rename to bin/wxmsw28_html_vc_custom.dll
diff --git a/lualibs/wx/wxmsw28_media_vc_custom.dll b/bin/wxmsw28_media_vc_custom.dll
similarity index 100%
rename from lualibs/wx/wxmsw28_media_vc_custom.dll
rename to bin/wxmsw28_media_vc_custom.dll
diff --git a/lualibs/wx/wxmsw28_qa_vc_custom.dll b/bin/wxmsw28_qa_vc_custom.dll
similarity index 100%
rename from lualibs/wx/wxmsw28_qa_vc_custom.dll
rename to bin/wxmsw28_qa_vc_custom.dll
diff --git a/lualibs/wx/wxmsw28_richtext_vc_custom.dll b/bin/wxmsw28_richtext_vc_custom.dll
similarity index 100%
rename from lualibs/wx/wxmsw28_richtext_vc_custom.dll
rename to bin/wxmsw28_richtext_vc_custom.dll
diff --git a/lualibs/wx/wxmsw28_stc_vc_custom.dll b/bin/wxmsw28_stc_vc_custom.dll
similarity index 100%
rename from lualibs/wx/wxmsw28_stc_vc_custom.dll
rename to bin/wxmsw28_stc_vc_custom.dll
diff --git a/lualibs/wx/wxmsw28_xrc_vc_custom.dll b/bin/wxmsw28_xrc_vc_custom.dll
similarity index 100%
rename from lualibs/wx/wxmsw28_xrc_vc_custom.dll
rename to bin/wxmsw28_xrc_vc_custom.dll
diff --git a/estrela.exe b/estrela.exe
index 2cbd2e20cf..ed5d2d3ec4 100644
Binary files a/estrela.exe and b/estrela.exe differ
diff --git a/interpreters/lua.lua b/interpreters/lua.lua
index 6099c5fe68..3557db78a3 100644
--- a/interpreters/lua.lua
+++ b/interpreters/lua.lua
@@ -8,10 +8,10 @@ return {
 					xpcall(function() dofile '%s' end,
 						function(err) print(debug.traceback(err)) end)
 				]]):format(filepath:gsub("\\","/"))
-				return '"'..mainpath..'/lualibs/lua.exe" -e "'..code..'"'
+				return '"'..mainpath..'/bin/lua.exe" -e "'..code..'"'
 			end,
 		fprojdir = function(fname) 
-				return ide.editorFilename..'/lualibs/' --fname:GetPath(wx.wxPATH_GET_VOLUME)
+				return fname:GetPath(wx.wxPATH_GET_VOLUME)
 			end,
 		capture = true,
 		fworkdir = function (filepath) 
diff --git a/src/main.lua b/src/main.lua
index dfb880f456..edc35840e2 100644
--- a/src/main.lua
+++ b/src/main.lua
@@ -1,8 +1,6 @@
 -- authors: Luxinia Dev (Eike Decker & Christoph Kubisch)
 ---------------------------------------------------------
 
--- Load the wxLua module, does nothing if running from wxLua, wxLuaFreeze, or wxLuaEdit
-package.cpath = package.cpath..";./?.dll;./?.so;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;"
 require("wx")
 require("bit")
 
diff --git a/src/win32_starter.c b/src/win32_starter.c
index 01e7677bba..36aa8926c0 100644
--- a/src/win32_starter.c
+++ b/src/win32_starter.c
@@ -77,9 +77,8 @@ int main (int argc, char *argv[])
 	SetCurrentDirectory(buffer);
 
 
-	SetDllDirectory(".\\lualibs\\");
+	SetDllDirectory(".\\bin\\");
 	hinstLib = LoadLibrary("lua5.1.dll");
-	SetDllDirectory(".\\lualibs\\wx\\");
 	if (hinstLib != NULL)
     {
 		luaL_newstate = (voidfunc*) GetProcAddress(hinstLib, "luaL_newstate");