From 346960b012e0897d17de2a5008d7a8e33f7acd81 Mon Sep 17 00:00:00 2001
From: Andreas Maerten <24669514+Yimura@users.noreply.github.com>
Date: Sun, 2 Jul 2023 00:52:36 +0200
Subject: [PATCH] refactor!: General changes (#1578)

- Removed try catch from main.cpp for better error logging
- Added migration code to the YimMenu folder
- Renamed globals to settings
- refactor!: changed symlink
---
 BigBaseV2.lnk                                 | Bin 2091 -> 0 bytes
 YimMenu.lnk                                   | Bin 0 -> 2094 bytes
 src/byte_patch_manager.hpp                    |   8 +-
 src/common.hpp                                |   2 +-
 src/core/{globals.cpp => settings.cpp}        |   2 +-
 src/core/{globals.hpp => settings.hpp}        |   0
 .../assign_physical_index.cpp                 |   1 -
 src/main.cpp                                  | 266 +++++++++---------
 src/script_function.cpp                       |   2 +-
 src/services/orbital_drone/orbital_drone.cpp  |   1 -
 src/util/migrate.hpp                          |  17 ++
 11 files changed, 154 insertions(+), 145 deletions(-)
 delete mode 100644 BigBaseV2.lnk
 create mode 100644 YimMenu.lnk
 rename src/core/{globals.cpp => settings.cpp} (98%)
 rename src/core/{globals.hpp => settings.hpp} (100%)
 create mode 100644 src/util/migrate.hpp

diff --git a/BigBaseV2.lnk b/BigBaseV2.lnk
deleted file mode 100644
index 0a51d5fb059a3f0b3f4d826b5609ca6f19adf112..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2091
zcmd^AZAepL6h2d<tf*Pb!YnJAS>)QBHZ>&o(Y8P|wzdo|<*nT<)9LMQP(S*hegszg
z)5pxj68exJp`bF%!hVc?6@5UF1VI!S(T5;W5!G{UYoh(Ae*2E+yyu?tzRx-Dx$n-c
zA|j104U(u|mE=5}Hi@**S9dq|oZRzN^YC)_vNp^=bgwgcR-N!`eyvYQSyN7V4p&b4
zMrC!Eqb1=x@x8(LJ|FAy>BDViw66KKxiI=vGvQi#r2?iEtvmf3K}QEDO1WfrdY##1
zQW*z5{ikM-RhAuMRD>m(vvE`W#bb9YG~3+wzMwa8@9T>*A-}c7mAKo`e|=viWl{#>
z40>*~4SR}?8nCBYWtyeR5fQh<$VxJP4iXWU*=^)c#vS%Ni)+c#EQafwLNuE7d7N2m
zRI0fngsL{MxR^ZD47M=UQxk<?%_bqms&CbjZLP~@_3p(19m#At+OTIyEAy_Z=8Ec6
zwh^HzGH7gI3?WC6A|xTxBDm)O8-QGZ_wif^@bCj!Kst~&rCrChCwsZzi%3dD5Ss#u
zBqS><Bu^^X>O(d$BKg6+hz$4%qvYs<31f~bAi1$A>JS}?b?QY~4&WW?M?wgk&v+Vo
zygI&c0nB{i^r-Hi6&rVD8BbS0J!>5#{uZ6J$&&}9NJF$)E>uLxtXQ^CaEsL8{k*%X
z<E43R@Xm~k-oc3_(wnzgmp)BhKPzFV`<uTOojeo#JHT)9uJgV#-Wsq|i>vGNgPG?d
z!9_mU0~|XKSO|>nSPQ6t>{O1+=~Fw60x96SHer*3&LfQJn@gEW9Wh7_`0`M#v#+Yu
ze)HSRWBDh;_c@UaUcmuZ0A4gH6Ho#asai4QN<5n(ivc4v_OVt*rDTE6f|;#m=*93E
zRcjgiMp#XdM#$geI22CCIHd3S;L6dSA4;n`a{BEhJ?xWt5hugSpMOCj{#r~2(E2gH
zbgG{~K4|I~Q}N(LyK6*67Elm9zY+D3P@!MDr(srir#_f?-Vbn27q)LLs5tQ`>)I3Q
zuX#4-fdu<}K+TE6{7?P=r42JTk1~K0xRM=qbjM_Om%Gw%u431bd9ZKe1#TeN{&8Sv
T@<rR#o>zvm%QXkt{(Jlc#tbL6

diff --git a/YimMenu.lnk b/YimMenu.lnk
new file mode 100644
index 0000000000000000000000000000000000000000..b5aa5a79007125dbd0ae2eec7466f9004ee60d34
GIT binary patch
literal 2094
zcmd^9ZAg<*6h2dbq=w&35lb^B7PV$teuSh><{+1$IW*qPm)z#p=Gv6{BVj)bQwcIl
z2~5(o!UUrdOiKz0kwOX*MX*I5KSFIkf~=^X^ZJpR5dHRy=iGbGx%au}ocHde6Ok;y
z1)6A3(xj<%*+4#+55J)!N4v&l(>okZg&2qZCNqo}B`5r{`Ta|}Se8JcnzUfoT-$-p
z)S98}#-AmsnF#EQpxH;v7}D1!54<=ob9(8X<ln?NGG;Y_F@VleIfal~lckYUl*Blo
zKb7f6$yRHsST4d+9-NzZdFqw6-V_+!KNHzE^!(e@HIqKMCT-|h$>4)CN#ss$xQEX<
z^xoY{oT+Z$7+od4KWhK=5lSX2eyJqlUS>}r{ldKty=RXPWtNHNB8!PuvU>I~>$x>q
zD?cVtCY6EBOhsfN6L!j%vDS9`P;QY~XRuT(u{!jbZ4P~{6zi1`{tC>$Tw;X_lnXvH
z>Bs=q3OMCJ9uNX>emw31SdIa{0Ox$yQsu=}Cv}35Z8zBLLb9d6W)ST<(O@e#ScHY*
z3Jb{!i{a5W#Gxc%4ZX5%!m5mgRj~#j3`E$f5Uth%d`89M6#|E~zC?kS!Edf$;ms*f
z-<4l>9TsJMJpn1(9Q@7Q@t-(}RaDmDtZCK2gqmv7I=_zkx7&^3*{~Pz&QM@0u(GLy
zQ6#A;0goq}>}Ux#XaP^kf<rc}g;lL>J5xzg56u_8J)fiLPmfbS{Ndja(PVzXfw=Jw
zzHm2?g>DiB>;?8nvl!@oSVu$004mJb$Fq2fqgeQ2F|sup^BDM4k~JQF6|7OvD(FSI
zgb4?uaw>Xf(}I0&I9>AVT0V6tVE5on91KrV(ELo$qLi&3#6+6_ZvcH1GS}MMR5>Q&
zM3>Uoh=m3xOHq+9GNLV)qCQ-$`O{t)rPIFx-n%#BG_R`wj;W*gL}X&)OW*siX)t3v
zXw(4v7T&-y@iqTb|G!)0S{X4rp;Yq$^vKPrcj~R$PHmF1J@ItiX4ngPgBCDe{XF6H
zxRr9R_noqBr>vUoEcpQ1ZEFrMAa?ZJ!Xg_7FNw#<mk%Z8@I$?M{ZEe@t2*XNTW%i=
Sn(?g>C%<c{`SHK}O!6C&<1ifn

literal 0
HcmV?d00001

diff --git a/src/byte_patch_manager.hpp b/src/byte_patch_manager.hpp
index 145ead78..a8d0faa5 100644
--- a/src/byte_patch_manager.hpp
+++ b/src/byte_patch_manager.hpp
@@ -4,12 +4,12 @@ extern "C" std::uint64_t g_sound_overload_ret_addr;
 
 namespace big
 {
-    class byte_patch_manager
-    {
+	class byte_patch_manager
+	{
 	public:
 		byte_patch_manager();
 		~byte_patch_manager();
-    };
+	};
 
-    inline byte_patch_manager* g_byte_patch_manager;
+	inline byte_patch_manager* g_byte_patch_manager;
 }
diff --git a/src/common.hpp b/src/common.hpp
index 044b4fcc..87efa0cd 100644
--- a/src/common.hpp
+++ b/src/common.hpp
@@ -54,7 +54,7 @@
 
 #include "logger/logger.hpp"
 
-#include "core/globals.hpp"
+#include "core/settings.hpp"
 #include "gta/natives.hpp"
 #include "ped/CPed.hpp"
 
diff --git a/src/core/globals.cpp b/src/core/settings.cpp
similarity index 98%
rename from src/core/globals.cpp
rename to src/core/settings.cpp
index c03130af..f39b5da3 100644
--- a/src/core/globals.cpp
+++ b/src/core/settings.cpp
@@ -1,4 +1,4 @@
-#include "globals.hpp"
+#include "settings.hpp"
 
 #include "thread_pool.hpp"
 
diff --git a/src/core/globals.hpp b/src/core/settings.hpp
similarity index 100%
rename from src/core/globals.hpp
rename to src/core/settings.hpp
diff --git a/src/hooks/player_management/assign_physical_index.cpp b/src/hooks/player_management/assign_physical_index.cpp
index c410dc5e..8ec4591e 100644
--- a/src/hooks/player_management/assign_physical_index.cpp
+++ b/src/hooks/player_management/assign_physical_index.cpp
@@ -1,6 +1,5 @@
 #include "backend/player_command.hpp"
 #include "core/data/admin_rids.hpp"
-#include "core/globals.hpp"
 #include "fiber_pool.hpp"
 #include "gta_util.hpp"
 #include "hooking.hpp"
diff --git a/src/main.cpp b/src/main.cpp
index 222d64cc..efa2d7b8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,6 @@
 #include "backend/backend.hpp"
 #include "byte_patch_manager.hpp"
 #include "common.hpp"
-#include "core/globals.hpp"
 #include "fiber_pool.hpp"
 #include "gui.hpp"
 #include "hooking.hpp"
@@ -33,6 +32,7 @@
 #include "services/vehicle/handling_service.hpp"
 #include "services/vehicle/vehicle_control_service.hpp"
 #include "thread_pool.hpp"
+#include "util/migrate.hpp"
 #include "version.hpp"
 
 BOOL APIENTRY DllMain(HMODULE hmod, DWORD reason, PVOID)
@@ -52,7 +52,8 @@ BOOL APIENTRY DllMain(HMODULE hmod, DWORD reason, PVOID)
 				    std::this_thread::sleep_for(100ms);
 
 			    std::filesystem::path base_dir = std::getenv("appdata");
-			    base_dir /= "BigBaseV2";
+			    base_dir /= "YimMenu";
+			    do_migration(base_dir);
 			    auto file_manager_instance = std::make_unique<file_manager>(base_dir);
 
 			    auto logger_instance = std::make_unique<logger>("YimMenu", file_manager_instance->get_project_file("./cout.log"));
@@ -61,171 +62,164 @@ BOOL APIENTRY DllMain(HMODULE hmod, DWORD reason, PVOID)
 
 			    std::srand(std::chrono::system_clock::now().time_since_epoch().count());
 
-			    try
-			    {
-				    LOG(INFO) << "Yim's Menu Initializing";
-				    LOGF(INFO, "Git Info\n\tBranch:\t{}\n\tHash:\t{}\n\tDate:\t{}", version::GIT_BRANCH, version::GIT_SHA1, version::GIT_DATE);
+			    LOG(INFO) << "Yim's Menu Initializing";
+			    LOGF(INFO, "Git Info\n\tBranch:\t{}\n\tHash:\t{}\n\tDate:\t{}", version::GIT_BRANCH, version::GIT_SHA1, version::GIT_DATE);
 
-				    auto thread_pool_instance = std::make_unique<thread_pool>();
-				    LOG(INFO) << "Thread pool initialized.";
+			    auto thread_pool_instance = std::make_unique<thread_pool>();
+			    LOG(INFO) << "Thread pool initialized.";
 
-				    g.init(file_manager_instance->get_project_file("./settings.json"));
-				    LOG(INFO) << "Settings Loaded.";
+			    g.init(file_manager_instance->get_project_file("./settings.json"));
+			    LOG(INFO) << "Settings Loaded.";
 
-				    auto pointers_instance = std::make_unique<pointers>();
-				    LOG(INFO) << "Pointers initialized.";
+			    auto pointers_instance = std::make_unique<pointers>();
+			    LOG(INFO) << "Pointers initialized.";
 
-				    auto byte_patch_manager_instance = std::make_unique<byte_patch_manager>();
-				    LOG(INFO) << "Byte Patch Manager initialized.";
+			    auto byte_patch_manager_instance = std::make_unique<byte_patch_manager>();
+			    LOG(INFO) << "Byte Patch Manager initialized.";
 
-				    auto renderer_instance = std::make_unique<renderer>();
-				    LOG(INFO) << "Renderer initialized.";
-				    auto gui_instance = std::make_unique<gui>();
+			    auto renderer_instance = std::make_unique<renderer>();
+			    LOG(INFO) << "Renderer initialized.";
+			    auto gui_instance = std::make_unique<gui>();
 
-				    auto fiber_pool_instance = std::make_unique<fiber_pool>(11);
-				    LOG(INFO) << "Fiber pool initialized.";
+			    auto fiber_pool_instance = std::make_unique<fiber_pool>(11);
+			    LOG(INFO) << "Fiber pool initialized.";
 
-				    g_translation_service.init();
-				    LOG(INFO) << "Translation Service initialized.";
+			    g_translation_service.init();
+			    LOG(INFO) << "Translation Service initialized.";
 
-				    auto hooking_instance = std::make_unique<hooking>();
-				    LOG(INFO) << "Hooking initialized.";
+			    auto hooking_instance = std::make_unique<hooking>();
+			    LOG(INFO) << "Hooking initialized.";
 
-				    auto context_menu_service_instance      = std::make_unique<context_menu_service>();
-				    auto custom_text_service_instance       = std::make_unique<custom_text_service>();
-				    auto globals_service_instace            = std::make_unique<globals_service>();
-				    auto mobile_service_instance            = std::make_unique<mobile_service>();
-				    auto notification_service_instance      = std::make_unique<notification_service>();
-				    auto pickup_service_instance            = std::make_unique<pickup_service>();
-				    auto player_service_instance            = std::make_unique<player_service>();
-				    auto gta_data_service_instance          = std::make_unique<gta_data_service>();
-				    auto model_preview_service_instance     = std::make_unique<model_preview_service>();
-				    auto handling_service_instance          = std::make_unique<handling_service>();
-				    auto gui_service_instance               = std::make_unique<gui_service>();
-				    auto script_patcher_service_instance    = std::make_unique<script_patcher_service>();
-				    auto player_database_service_instance   = std::make_unique<player_database_service>();
-				    auto hotkey_service_instance            = std::make_unique<hotkey_service>();
-				    auto matchmaking_service_instance       = std::make_unique<matchmaking_service>();
-				    auto api_service_instance               = std::make_unique<api_service>();
-				    auto tunables_service_instance          = std::make_unique<tunables_service>();
-				    auto script_connection_service_instance = std::make_unique<script_connection_service>();
-				    LOG(INFO) << "Registered service instances...";
+			    auto context_menu_service_instance      = std::make_unique<context_menu_service>();
+			    auto custom_text_service_instance       = std::make_unique<custom_text_service>();
+			    auto globals_service_instace            = std::make_unique<globals_service>();
+			    auto mobile_service_instance            = std::make_unique<mobile_service>();
+			    auto notification_service_instance      = std::make_unique<notification_service>();
+			    auto pickup_service_instance            = std::make_unique<pickup_service>();
+			    auto player_service_instance            = std::make_unique<player_service>();
+			    auto gta_data_service_instance          = std::make_unique<gta_data_service>();
+			    auto model_preview_service_instance     = std::make_unique<model_preview_service>();
+			    auto handling_service_instance          = std::make_unique<handling_service>();
+			    auto gui_service_instance               = std::make_unique<gui_service>();
+			    auto script_patcher_service_instance    = std::make_unique<script_patcher_service>();
+			    auto player_database_service_instance   = std::make_unique<player_database_service>();
+			    auto hotkey_service_instance            = std::make_unique<hotkey_service>();
+			    auto matchmaking_service_instance       = std::make_unique<matchmaking_service>();
+			    auto api_service_instance               = std::make_unique<api_service>();
+			    auto tunables_service_instance          = std::make_unique<tunables_service>();
+			    auto script_connection_service_instance = std::make_unique<script_connection_service>();
+			    LOG(INFO) << "Registered service instances...";
 
-				    g_script_mgr.add_script(std::make_unique<script>(&gui::script_func, "GUI", false));
+			    g_script_mgr.add_script(std::make_unique<script>(&gui::script_func, "GUI", false));
 
-				    g_script_mgr.add_script(std::make_unique<script>(&backend::loop, "Backend Loop", false));
-				    g_script_mgr.add_script(std::make_unique<script>(&backend::self_loop, "Self"));
-				    g_script_mgr.add_script(std::make_unique<script>(&backend::weapons_loop, "Weapon"));
-				    g_script_mgr.add_script(std::make_unique<script>(&backend::vehicles_loop, "Vehicle"));
-				    g_script_mgr.add_script(std::make_unique<script>(&backend::misc_loop, "Miscellaneous"));
-				    g_script_mgr.add_script(std::make_unique<script>(&backend::remote_loop, "Remote"));
-				    g_script_mgr.add_script(std::make_unique<script>(&backend::lscustoms_loop, "LS Customs"));
-				    g_script_mgr.add_script(std::make_unique<script>(&backend::rainbowpaint_loop, "Rainbow Paint"));
-				    g_script_mgr.add_script(std::make_unique<script>(&backend::disable_control_action_loop, "Disable Controls"));
-				    g_script_mgr.add_script(std::make_unique<script>(&backend::world_loop, "World"));
-				    g_script_mgr.add_script(std::make_unique<script>(&backend::orbital_drone, "Orbital Drone"));
-				    g_script_mgr.add_script(std::make_unique<script>(&backend::vehicle_control, "Vehicle Control"));
-				    g_script_mgr.add_script(std::make_unique<script>(&context_menu_service::context_menu, "Context Menu"));
-				    g_script_mgr.add_script(std::make_unique<script>(&backend::tunables_script, "Tunables"));
-				    g_script_mgr.add_script(std::make_unique<script>(&backend::squad_spawner, "Squad Spawner"));
+			    g_script_mgr.add_script(std::make_unique<script>(&backend::loop, "Backend Loop", false));
+			    g_script_mgr.add_script(std::make_unique<script>(&backend::self_loop, "Self"));
+			    g_script_mgr.add_script(std::make_unique<script>(&backend::weapons_loop, "Weapon"));
+			    g_script_mgr.add_script(std::make_unique<script>(&backend::vehicles_loop, "Vehicle"));
+			    g_script_mgr.add_script(std::make_unique<script>(&backend::misc_loop, "Miscellaneous"));
+			    g_script_mgr.add_script(std::make_unique<script>(&backend::remote_loop, "Remote"));
+			    g_script_mgr.add_script(std::make_unique<script>(&backend::lscustoms_loop, "LS Customs"));
+			    g_script_mgr.add_script(std::make_unique<script>(&backend::rainbowpaint_loop, "Rainbow Paint"));
+			    g_script_mgr.add_script(std::make_unique<script>(&backend::disable_control_action_loop, "Disable Controls"));
+			    g_script_mgr.add_script(std::make_unique<script>(&backend::world_loop, "World"));
+			    g_script_mgr.add_script(std::make_unique<script>(&backend::orbital_drone, "Orbital Drone"));
+			    g_script_mgr.add_script(std::make_unique<script>(&backend::vehicle_control, "Vehicle Control"));
+			    g_script_mgr.add_script(std::make_unique<script>(&context_menu_service::context_menu, "Context Menu"));
+			    g_script_mgr.add_script(std::make_unique<script>(&backend::tunables_script, "Tunables"));
+			    g_script_mgr.add_script(std::make_unique<script>(&backend::squad_spawner, "Squad Spawner"));
 
-				    LOG(INFO) << "Scripts registered.";
+			    LOG(INFO) << "Scripts registered.";
 
-				    g_hooking->enable();
-				    LOG(INFO) << "Hooking enabled.";
+			    g_hooking->enable();
+			    LOG(INFO) << "Hooking enabled.";
 
-				    auto native_hooks_instance = std::make_unique<native_hooks>();
-				    LOG(INFO) << "Dynamic native hooker initialized.";
+			    auto native_hooks_instance = std::make_unique<native_hooks>();
+			    LOG(INFO) << "Dynamic native hooker initialized.";
 
-				    auto lua_manager_instance = std::make_unique<lua_manager>();
-				    LOG(INFO) << "Lua manager initialized.";
+			    auto lua_manager_instance = std::make_unique<lua_manager>();
+			    LOG(INFO) << "Lua manager initialized.";
 
-				    g_running = true;
+			    g_running = true;
 
-				    // start update loop after setting g_running to true to prevent it from exiting instantly
-				    g_player_database_service->start_update_loop();
+			    // start update loop after setting g_running to true to prevent it from exiting instantly
+			    g_player_database_service->start_update_loop();
 
-				    while (g_running)
-					    std::this_thread::sleep_for(500ms);
+			    while (g_running)
+				    std::this_thread::sleep_for(500ms);
 
-				    lua_manager_instance.reset();
-				    LOG(INFO) << "Lua manager uninitialized.";
+			    lua_manager_instance.reset();
+			    LOG(INFO) << "Lua manager uninitialized.";
 
-				    g_hooking->disable();
-				    LOG(INFO) << "Hooking disabled.";
+			    g_hooking->disable();
+			    LOG(INFO) << "Hooking disabled.";
 
-				    native_hooks_instance.reset();
-				    LOG(INFO) << "Dynamic native hooker uninitialized.";
+			    native_hooks_instance.reset();
+			    LOG(INFO) << "Dynamic native hooker uninitialized.";
 
-				    g_script_mgr.remove_all_scripts();
-				    LOG(INFO) << "Scripts unregistered.";
+			    g_script_mgr.remove_all_scripts();
+			    LOG(INFO) << "Scripts unregistered.";
 
-				    // cleans up the thread responsible for saving settings
-				    g.destroy();
+			    // cleans up the thread responsible for saving settings
+			    g.destroy();
 
-				    // Make sure that all threads created don't have any blocking loops
-				    // otherwise make sure that they have stopped executing
-				    thread_pool_instance->destroy();
-				    LOG(INFO) << "Destroyed thread pool.";
+			    // Make sure that all threads created don't have any blocking loops
+			    // otherwise make sure that they have stopped executing
+			    thread_pool_instance->destroy();
+			    LOG(INFO) << "Destroyed thread pool.";
 
-				    script_connection_service_instance.reset();
-				    LOG(INFO) << "Script Connection Service reset.";
-				    tunables_service_instance.reset();
-				    LOG(INFO) << "Tunables Service reset.";
-				    hotkey_service_instance.reset();
-				    LOG(INFO) << "Hotkey Service reset.";
-				    matchmaking_service_instance.reset();
-				    LOG(INFO) << "Matchmaking Service reset.";
-				    player_database_service_instance.reset();
-				    LOG(INFO) << "Player Database Service reset.";
-				    api_service_instance.reset();
-				    LOG(INFO) << "API Service reset.";
-				    script_patcher_service_instance.reset();
-				    LOG(INFO) << "Script Patcher Service reset.";
-				    gui_service_instance.reset();
-				    LOG(INFO) << "Gui Service reset.";
-				    gta_data_service_instance.reset();
-				    LOG(INFO) << "GTA Data Service reset.";
-				    handling_service_instance.reset();
-				    LOG(INFO) << "Vehicle Service reset.";
-				    model_preview_service_instance.reset();
-				    LOG(INFO) << "Model Preview Service reset.";
-				    mobile_service_instance.reset();
-				    LOG(INFO) << "Mobile Service reset.";
-				    player_service_instance.reset();
-				    LOG(INFO) << "Player Service reset.";
-				    pickup_service_instance.reset();
-				    LOG(INFO) << "Pickup Service reset.";
-				    globals_service_instace.reset();
-				    LOG(INFO) << "Globals Service reset.";
-				    custom_text_service_instance.reset();
-				    LOG(INFO) << "Custom Text Service reset.";
-				    context_menu_service_instance.reset();
-				    LOG(INFO) << "Context Service reset.";
-				    LOG(INFO) << "Services uninitialized.";
+			    script_connection_service_instance.reset();
+			    LOG(INFO) << "Script Connection Service reset.";
+			    tunables_service_instance.reset();
+			    LOG(INFO) << "Tunables Service reset.";
+			    hotkey_service_instance.reset();
+			    LOG(INFO) << "Hotkey Service reset.";
+			    matchmaking_service_instance.reset();
+			    LOG(INFO) << "Matchmaking Service reset.";
+			    player_database_service_instance.reset();
+			    LOG(INFO) << "Player Database Service reset.";
+			    api_service_instance.reset();
+			    LOG(INFO) << "API Service reset.";
+			    script_patcher_service_instance.reset();
+			    LOG(INFO) << "Script Patcher Service reset.";
+			    gui_service_instance.reset();
+			    LOG(INFO) << "Gui Service reset.";
+			    gta_data_service_instance.reset();
+			    LOG(INFO) << "GTA Data Service reset.";
+			    handling_service_instance.reset();
+			    LOG(INFO) << "Vehicle Service reset.";
+			    model_preview_service_instance.reset();
+			    LOG(INFO) << "Model Preview Service reset.";
+			    mobile_service_instance.reset();
+			    LOG(INFO) << "Mobile Service reset.";
+			    player_service_instance.reset();
+			    LOG(INFO) << "Player Service reset.";
+			    pickup_service_instance.reset();
+			    LOG(INFO) << "Pickup Service reset.";
+			    globals_service_instace.reset();
+			    LOG(INFO) << "Globals Service reset.";
+			    custom_text_service_instance.reset();
+			    LOG(INFO) << "Custom Text Service reset.";
+			    context_menu_service_instance.reset();
+			    LOG(INFO) << "Context Service reset.";
+			    LOG(INFO) << "Services uninitialized.";
 
-				    hooking_instance.reset();
-				    LOG(INFO) << "Hooking uninitialized.";
+			    hooking_instance.reset();
+			    LOG(INFO) << "Hooking uninitialized.";
 
-				    fiber_pool_instance.reset();
-				    LOG(INFO) << "Fiber pool uninitialized.";
+			    fiber_pool_instance.reset();
+			    LOG(INFO) << "Fiber pool uninitialized.";
 
-				    renderer_instance.reset();
-				    LOG(INFO) << "Renderer uninitialized.";
+			    renderer_instance.reset();
+			    LOG(INFO) << "Renderer uninitialized.";
 
-				    byte_patch_manager_instance.reset();
-				    LOG(INFO) << "Byte Patch Manager uninitialized.";
+			    byte_patch_manager_instance.reset();
+			    LOG(INFO) << "Byte Patch Manager uninitialized.";
 
-				    pointers_instance.reset();
-				    LOG(INFO) << "Pointers uninitialized.";
+			    pointers_instance.reset();
+			    LOG(INFO) << "Pointers uninitialized.";
 
-				    thread_pool_instance.reset();
-				    LOG(INFO) << "Thread pool uninitialized.";
-			    }
-			    catch (std::exception const& ex)
-			    {
-				    LOG(WARNING) << ex.what();
-			    }
+			    thread_pool_instance.reset();
+			    LOG(INFO) << "Thread pool uninitialized.";
 
 			    LOG(INFO) << "Farewell!";
 			    logger_instance->destroy();
diff --git a/src/script_function.cpp b/src/script_function.cpp
index b0e01849..68b88e1c 100644
--- a/src/script_function.cpp
+++ b/src/script_function.cpp
@@ -116,7 +116,7 @@ namespace big
 		call(thread, gta_util::find_script_program(m_script), args);
 
 		delete[] stack;
-		delete[](uint8_t*) thread; // without the cast it ends up calling the destructor which leads to some pretty funny crashes
+		delete[] (uint8_t*)thread; // without the cast it ends up calling the destructor which leads to some pretty funny crashes
 	}
 
 	void script_function::operator()(std::initializer_list<std::uint64_t> args)
diff --git a/src/services/orbital_drone/orbital_drone.cpp b/src/services/orbital_drone/orbital_drone.cpp
index 3ac9b7a1..7fb92bbe 100644
--- a/src/services/orbital_drone/orbital_drone.cpp
+++ b/src/services/orbital_drone/orbital_drone.cpp
@@ -1,7 +1,6 @@
 #include "orbital_drone.hpp"
 
 #include "backend/bool_command.hpp"
-#include "core/globals.hpp"
 #include "gui.hpp"
 #include "natives.hpp"
 #include "pointers.hpp"
diff --git a/src/util/migrate.hpp b/src/util/migrate.hpp
new file mode 100644
index 00000000..7a8ed535
--- /dev/null
+++ b/src/util/migrate.hpp
@@ -0,0 +1,17 @@
+#pragma once
+#include <filesystem>
+
+namespace big
+{
+    void do_migration(const std::filesystem::path& current_dir)
+    {
+        std::filesystem::path old_dir = std::getenv("appdata");
+        old_dir /= "BigBaseV2";
+
+        if (exists(old_dir) && !exists(current_dir))
+        {
+            LOG(INFO) << "YimMenu folder does not exist, migrating to new folder.";
+            std::filesystem::copy(old_dir, current_dir, std::filesystem::copy_options::recursive);
+        }
+    }
+}
\ No newline at end of file