diff --git a/CMakeLists.txt b/CMakeLists.txt
index 676c12f..a7ae80c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,8 +15,8 @@ set(DIRECTX9_SDK_DIR $ENV{DIRECTX9_SDK_DIR})
 ################################################################################
 # Required projects
 ################################################################################
-add_subdirectory(src/vendor)
-add_subdirectory(src/tests)
+add_subdirectory(deps)
+add_subdirectory(tests)
 
 ################################################################################
 # Source groups
@@ -93,6 +93,7 @@ include_directories(
     "${PLUGIN_SDK_DIR}/shared"
     "${PLUGIN_SDK_DIR}/shared/game"
     "${DIRECTX9_SDK_DIR}/include"
+    "deps"
 )
 
 ################################################################################
@@ -178,17 +179,17 @@ d3dx9
 d3d11
 d3dx11
 XInput9_1_0
-Vendor
+Depend
 )
 
 target_link_directories(${PROJECT_NAME} PUBLIC
     "${PLUGIN_SDK_DIR}/output/lib/"
     "${DIRECTX9_SDK_DIR}/lib/x86/"
     "$<$<CONFIG:Release>:"
-        "vendor/Release/"
+        "deps/Release/"
     ">"
     "$<$<CONFIG:Debug>:"
-        "vendor/Debug/"
+        "deps/Debug/"
     ">"
 )
 
diff --git a/src/vendor/CMakeLists.txt b/deps/CMakeLists.txt
similarity index 94%
rename from src/vendor/CMakeLists.txt
rename to deps/CMakeLists.txt
index 210a11e..63793b2 100644
--- a/src/vendor/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -1,11 +1,11 @@
 ################################################################################
-# Build Vendor.lib
+# Build Depend.lib
 # All the external libraries that shouldn't need to be compiled often
 ################################################################################
 cmake_minimum_required(VERSION 3.0)
-project(Vendor)
+project(Depend)
 
-set(vendor_files
+set(depend_files
     "fla/Main.h"
     "fla/Main.cpp"
     "fla/IDaccess.h"
@@ -41,7 +41,7 @@ set(vendor_files
     "kiero/minhook/trampoline.c"
 )
 
-add_library(${PROJECT_NAME} STATIC ${vendor_files})
+add_library(${PROJECT_NAME} STATIC ${depend_files})
 
 target_compile_definitions(${PROJECT_NAME} PRIVATE
     "$<$<CONFIG:Release>:"
@@ -105,7 +105,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
 )
 
 target_link_directories(${PROJECT_NAME} PUBLIC
-    ${CMAKE_SOURCE_DIR}"/src/vendor/kiero/minhook/lib/"
+    ${CMAKE_SOURCE_DIR}"/deps/kiero/minhook/lib/"
 )
 
 target_link_libraries(${PROJECT_NAME} PUBLIC 
diff --git a/src/vendor/fla/IDaccess.cpp b/deps/fla/IDaccess.cpp
similarity index 100%
rename from src/vendor/fla/IDaccess.cpp
rename to deps/fla/IDaccess.cpp
diff --git a/src/vendor/fla/IDaccess.h b/deps/fla/IDaccess.h
similarity index 100%
rename from src/vendor/fla/IDaccess.h
rename to deps/fla/IDaccess.h
diff --git a/src/vendor/fla/Library/Library.cpp b/deps/fla/Library/Library.cpp
similarity index 100%
rename from src/vendor/fla/Library/Library.cpp
rename to deps/fla/Library/Library.cpp
diff --git a/src/vendor/fla/Library/Library.h b/deps/fla/Library/Library.h
similarity index 100%
rename from src/vendor/fla/Library/Library.h
rename to deps/fla/Library/Library.h
diff --git a/src/vendor/fla/Main.cpp b/deps/fla/Main.cpp
similarity index 100%
rename from src/vendor/fla/Main.cpp
rename to deps/fla/Main.cpp
diff --git a/src/vendor/fla/Main.h b/deps/fla/Main.h
similarity index 100%
rename from src/vendor/fla/Main.h
rename to deps/fla/Main.h
diff --git a/src/vendor/fla/common/CValueExtension.h b/deps/fla/common/CValueExtension.h
similarity index 100%
rename from src/vendor/fla/common/CValueExtension.h
rename to deps/fla/common/CValueExtension.h
diff --git a/src/vendor/fla/common/CdDirectory.h b/deps/fla/common/CdDirectory.h
similarity index 100%
rename from src/vendor/fla/common/CdDirectory.h
rename to deps/fla/common/CdDirectory.h
diff --git a/src/vendor/fla/common/common.h b/deps/fla/common/common.h
similarity index 100%
rename from src/vendor/fla/common/common.h
rename to deps/fla/common/common.h
diff --git a/src/vendor/imgui/imconfig.h b/deps/imgui/imconfig.h
similarity index 100%
rename from src/vendor/imgui/imconfig.h
rename to deps/imgui/imconfig.h
diff --git a/src/vendor/imgui/imgui.cpp b/deps/imgui/imgui.cpp
similarity index 100%
rename from src/vendor/imgui/imgui.cpp
rename to deps/imgui/imgui.cpp
diff --git a/src/vendor/imgui/imgui.h b/deps/imgui/imgui.h
similarity index 100%
rename from src/vendor/imgui/imgui.h
rename to deps/imgui/imgui.h
diff --git a/src/vendor/imgui/imgui_demo.cpp b/deps/imgui/imgui_demo.cpp
similarity index 100%
rename from src/vendor/imgui/imgui_demo.cpp
rename to deps/imgui/imgui_demo.cpp
diff --git a/src/vendor/imgui/imgui_draw.cpp b/deps/imgui/imgui_draw.cpp
similarity index 100%
rename from src/vendor/imgui/imgui_draw.cpp
rename to deps/imgui/imgui_draw.cpp
diff --git a/src/vendor/imgui/imgui_impl_dx11.cpp b/deps/imgui/imgui_impl_dx11.cpp
similarity index 100%
rename from src/vendor/imgui/imgui_impl_dx11.cpp
rename to deps/imgui/imgui_impl_dx11.cpp
diff --git a/src/vendor/imgui/imgui_impl_dx11.h b/deps/imgui/imgui_impl_dx11.h
similarity index 100%
rename from src/vendor/imgui/imgui_impl_dx11.h
rename to deps/imgui/imgui_impl_dx11.h
diff --git a/src/vendor/imgui/imgui_impl_dx9.cpp b/deps/imgui/imgui_impl_dx9.cpp
similarity index 100%
rename from src/vendor/imgui/imgui_impl_dx9.cpp
rename to deps/imgui/imgui_impl_dx9.cpp
diff --git a/src/vendor/imgui/imgui_impl_dx9.h b/deps/imgui/imgui_impl_dx9.h
similarity index 100%
rename from src/vendor/imgui/imgui_impl_dx9.h
rename to deps/imgui/imgui_impl_dx9.h
diff --git a/src/vendor/imgui/imgui_impl_win32.cpp b/deps/imgui/imgui_impl_win32.cpp
similarity index 100%
rename from src/vendor/imgui/imgui_impl_win32.cpp
rename to deps/imgui/imgui_impl_win32.cpp
diff --git a/src/vendor/imgui/imgui_impl_win32.h b/deps/imgui/imgui_impl_win32.h
similarity index 100%
rename from src/vendor/imgui/imgui_impl_win32.h
rename to deps/imgui/imgui_impl_win32.h
diff --git a/src/vendor/imgui/imgui_internal.h b/deps/imgui/imgui_internal.h
similarity index 100%
rename from src/vendor/imgui/imgui_internal.h
rename to deps/imgui/imgui_internal.h
diff --git a/src/vendor/imgui/imgui_tables.cpp b/deps/imgui/imgui_tables.cpp
similarity index 100%
rename from src/vendor/imgui/imgui_tables.cpp
rename to deps/imgui/imgui_tables.cpp
diff --git a/src/vendor/imgui/imgui_widgets.cpp b/deps/imgui/imgui_widgets.cpp
similarity index 100%
rename from src/vendor/imgui/imgui_widgets.cpp
rename to deps/imgui/imgui_widgets.cpp
diff --git a/src/vendor/imgui/imstb_rectpack.h b/deps/imgui/imstb_rectpack.h
similarity index 100%
rename from src/vendor/imgui/imstb_rectpack.h
rename to deps/imgui/imstb_rectpack.h
diff --git a/src/vendor/imgui/imstb_textedit.h b/deps/imgui/imstb_textedit.h
similarity index 100%
rename from src/vendor/imgui/imstb_textedit.h
rename to deps/imgui/imstb_textedit.h
diff --git a/src/vendor/imgui/imstb_truetype.h b/deps/imgui/imstb_truetype.h
similarity index 100%
rename from src/vendor/imgui/imstb_truetype.h
rename to deps/imgui/imstb_truetype.h
diff --git a/src/vendor/imgui/stb_image.h b/deps/imgui/stb_image.h
similarity index 100%
rename from src/vendor/imgui/stb_image.h
rename to deps/imgui/stb_image.h
diff --git a/src/vendor/json.hpp b/deps/json.hpp
similarity index 100%
rename from src/vendor/json.hpp
rename to deps/json.hpp
diff --git a/src/vendor/kiero/kiero.cpp b/deps/kiero/kiero.cpp
similarity index 100%
rename from src/vendor/kiero/kiero.cpp
rename to deps/kiero/kiero.cpp
diff --git a/src/vendor/kiero/kiero.h b/deps/kiero/kiero.h
similarity index 100%
rename from src/vendor/kiero/kiero.h
rename to deps/kiero/kiero.h
diff --git a/src/vendor/kiero/minhook/MinHook.h b/deps/kiero/minhook/MinHook.h
similarity index 100%
rename from src/vendor/kiero/minhook/MinHook.h
rename to deps/kiero/minhook/MinHook.h
diff --git a/src/vendor/kiero/minhook/buffer.c b/deps/kiero/minhook/buffer.c
similarity index 100%
rename from src/vendor/kiero/minhook/buffer.c
rename to deps/kiero/minhook/buffer.c
diff --git a/src/vendor/kiero/minhook/buffer.h b/deps/kiero/minhook/buffer.h
similarity index 100%
rename from src/vendor/kiero/minhook/buffer.h
rename to deps/kiero/minhook/buffer.h
diff --git a/src/vendor/kiero/minhook/hde/hde32.c b/deps/kiero/minhook/hde/hde32.c
similarity index 100%
rename from src/vendor/kiero/minhook/hde/hde32.c
rename to deps/kiero/minhook/hde/hde32.c
diff --git a/src/vendor/kiero/minhook/hde/hde32.h b/deps/kiero/minhook/hde/hde32.h
similarity index 100%
rename from src/vendor/kiero/minhook/hde/hde32.h
rename to deps/kiero/minhook/hde/hde32.h
diff --git a/src/vendor/kiero/minhook/hde/pstdint.h b/deps/kiero/minhook/hde/pstdint.h
similarity index 100%
rename from src/vendor/kiero/minhook/hde/pstdint.h
rename to deps/kiero/minhook/hde/pstdint.h
diff --git a/src/vendor/kiero/minhook/hde/table32.h b/deps/kiero/minhook/hde/table32.h
similarity index 100%
rename from src/vendor/kiero/minhook/hde/table32.h
rename to deps/kiero/minhook/hde/table32.h
diff --git a/src/vendor/kiero/minhook/hook.c b/deps/kiero/minhook/hook.c
similarity index 100%
rename from src/vendor/kiero/minhook/hook.c
rename to deps/kiero/minhook/hook.c
diff --git a/src/vendor/kiero/minhook/trampoline.c b/deps/kiero/minhook/trampoline.c
similarity index 100%
rename from src/vendor/kiero/minhook/trampoline.c
rename to deps/kiero/minhook/trampoline.c
diff --git a/src/vendor/kiero/minhook/trampoline.h b/deps/kiero/minhook/trampoline.h
similarity index 100%
rename from src/vendor/kiero/minhook/trampoline.h
rename to deps/kiero/minhook/trampoline.h
diff --git a/src/Hook.cpp b/src/Hook.cpp
index 5e2caa8..758510c 100644
--- a/src/Hook.cpp
+++ b/src/Hook.cpp
@@ -1,6 +1,6 @@
 #include "Hook.h"
-#include "vendor/kiero/kiero.h"
-#include "vendor/kiero/minhook/MinHook.h"
+#include "kiero/kiero.h"
+#include "kiero/minhook/MinHook.h"
 
 WNDPROC Hook::oWndProc = NULL;
 f_Present11 Hook::oPresent11 = NULL;
@@ -22,7 +22,7 @@ LRESULT Hook::WndProc(const HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 		Call<0x541BD0>(); // CPad::ClearMouseHistory
 
 		if (uMsg == WM_MOUSEWHEEL)
-			return 1;
+			CallWindowProc(oWndProc, hWnd, uMsg, 1.0, lParam);
 	}
 	else
 		patch::SetRaw(0x4EB9F4, (void*)"\xE8\x67\xFC\xFF\xFF", 5); // enable radio scroll
diff --git a/src/Json.h b/src/Json.h
index eb35790..e41af97 100644
--- a/src/Json.h
+++ b/src/Json.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "vendor\json.hpp"
+#include "json.hpp"
 
 class CJson
 {
diff --git a/src/MenuInfo.h b/src/MenuInfo.h
index 39db292..f201110 100644
--- a/src/MenuInfo.h
+++ b/src/MenuInfo.h
@@ -1,5 +1,5 @@
 #pragma once
 #define MENU_NAME "Cheat Menu"
 #define MENU_VERSION "2.6-beta"
-#define BUILD_NUMBER "20210204"
+#define BUILD_NUMBER "20210210"
 #define MENU_TITLE MENU_NAME " v" MENU_VERSION "(" BUILD_NUMBER ")"
\ No newline at end of file
diff --git a/src/Util.cpp b/src/Util.cpp
index 46f3488..70129a0 100644
--- a/src/Util.cpp
+++ b/src/Util.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
 #include "Util.h"
-#include "vendor/imgui/stb_image.h"
+#include "imgui/stb_image.h"
 
 void Util::ClearCharTasksVehCheck(CPed* ped)
 {
diff --git a/src/pch.h b/src/pch.h
index 5b1d705..f7f1303 100644
--- a/src/pch.h
+++ b/src/pch.h
@@ -51,12 +51,12 @@
 #include "eVehicleClass.h"
 #include "extensions/Paths.h"
 
-#include "vendor/fla/IDaccess.h"
-#include "vendor/imgui/imgui.h"
-#include "vendor/imgui/imgui_internal.h"
-#include "vendor/imgui/imgui_impl_dx9.h"
-#include "vendor/imgui/imgui_impl_dx11.h"
-#include "vendor/imgui/imgui_impl_win32.h"
+#include "fla/IDaccess.h"
+#include "imgui/imgui.h"
+#include "imgui/imgui_internal.h"
+#include "imgui/imgui_impl_dx9.h"
+#include "imgui/imgui_impl_dx11.h"
+#include "imgui/imgui_impl_win32.h"
 
 #include "Events.h"
 #include "Json.h"
diff --git a/src/tests/CMakeLists.txt b/tests/CMakeLists.txt
similarity index 100%
rename from src/tests/CMakeLists.txt
rename to tests/CMakeLists.txt
diff --git a/src/tests/Test.cpp b/tests/Test.cpp
similarity index 100%
rename from src/tests/Test.cpp
rename to tests/Test.cpp