diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04f922d..c3c0329 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,12 @@
 if( ELUNA )
 	CU_SET_PATH("CMAKE_MOD_ELUNA_ENGINE_DIR" "${CMAKE_CURRENT_LIST_DIR}")
 	add_subdirectory(lualib)
-	add_subdirectory(LuaEngine)
+	#add_subdirectory(LuaEngine)
 	
+	CU_ADD_HOOK(BEFORE_GAME_LIBRARY "${CMAKE_CURRENT_LIST_DIR}/cmake/before_gs_install.cmake")
+	CU_ADD_HOOK(AFTER_GAME_LIBRARY "${CMAKE_CURRENT_LIST_DIR}/cmake/after_gs_install.cmake")
 	CU_ADD_HOOK(AFTER_WORLDSERVER_CMAKE "${CMAKE_CURRENT_LIST_DIR}/cmake/after_ws_install.cmake")
+
 	install(FILES "${CMAKE_MOD_ELUNA_ENGINE_DIR}/conf/mod_LuaEngine.conf.dist" DESTINATION ${CONF_DIR})
 endif()
 
diff --git a/LuaEngine b/LuaEngine
index 629e503..909e514 160000
--- a/LuaEngine
+++ b/LuaEngine
@@ -1 +1 @@
-Subproject commit 629e50357f7faa85173ae1181b4e81e4f1518e73
+Subproject commit 909e51499870287c3a9bf22a4b8e379aa9ea2594
diff --git a/cmake/after_gs_install.cmake b/cmake/after_gs_install.cmake
new file mode 100644
index 0000000..d7e00af
--- /dev/null
+++ b/cmake/after_gs_install.cmake
@@ -0,0 +1,21 @@
+
+add_dependencies(game lualib)
+target_link_libraries(game lualib)
+
+if( WIN32 )
+	if ( MSVC )
+		add_custom_command(TARGET game
+		POST_BUILD
+		COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/lua_scripts/extensions/"
+		COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_MOD_ELUNA_ENGINE_DIR}/LuaEngine/extensions" "${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/lua_scripts/extensions/"
+	)
+	elseif ( MINGW )
+		add_custom_command(TARGET game
+		POST_BUILD
+		COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bin/lua_scripts/extensions/"
+		COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_MOD_ELUNA_ENGINE_DIR}/LuaEngine/extensions" "${CMAKE_BINARY_DIR}/bin/lua_scripts/extensions/"
+	)
+	endif()
+endif()
+
+install(DIRECTORY extensions DESTINATION "${BIN_DIR}/lua_scripts/")
diff --git a/cmake/before_gs_install.cmake b/cmake/before_gs_install.cmake
new file mode 100644
index 0000000..d893169
--- /dev/null
+++ b/cmake/before_gs_install.cmake
@@ -0,0 +1,16 @@
+file(GLOB_RECURSE method_headers ${CMAKE_MOD_ELUNA_ENGINE_DIR}/LuaEngine/*Methods.h)
+file(GLOB_RECURSE sources_ElunaFile_CPP ${CMAKE_MOD_ELUNA_ENGINE_DIR}/LuaEngine/*.cpp )
+file(GLOB_RECURSE sources_ElunaFile_H ${CMAKE_MOD_ELUNA_ENGINE_DIR}/LuaEngine/*.h)
+
+set(game_STAT_SRCS
+	${game_STAT_SRCS}
+	${sources_ElunaFile_H}
+	${sources_ElunaFile_CPP}
+)
+
+source_group("LuaEngine\\Methods" FILES ${method_headers})
+
+source_group("LuaEngine\\Header Files" FILES ${sources_ElunaFile_H})
+
+source_group("LuaEngine\\Source Files" FILES ${sources_ElunaFile_CPP})
+