diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
deleted file mode 100644
index 782448a..0000000
--- a/.vscode/c_cpp_properties.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "configurations": [
-        {
-            "name": "Win32",
-            "includePath": [
-                "${default}",
-                "${workspaceFolder}/src/discord-game-sdk-cpp",
-                "${workspaceFolder}"
-            ],
-            "defines": [
-                "_DEBUG",
-                "UNICODE",
-                "_UNICODE"
-            ],
-            "windowsSdkVersion": "10.0.22621.0",
-            "compilerPath": "cl.exe",
-            "cStandard": "c17",
-            "cppStandard": "c++17",
-            "intelliSenseMode": "windows-msvc-x64"
-        }
-    ],
-    "version": 4
-}
\ No newline at end of file
diff --git a/SConstruct b/SConstruct
index 0377857..5283f44 100644
--- a/SConstruct
+++ b/SConstruct
@@ -14,10 +14,10 @@ env = SConscript("./godot-cpp/SConstruct")
 
 # tweak this if you want to use different folders, or more folders, to store your source code in.
 
-env.Append(CPPPATH=["src/"])
+env.Append(CPPPATH=["src/","src/discord-game-sdk-cpp"])
 
-env.Append(LIBPATH=["project/addons/discord-rpc-gd/lib"])
-env.Append(LIBS=["discord_game_sdk"])
+env.Append(LIBPATH=[ "./godot-cpp/bin", "src/discord-game-sdk-cpp/lib"])
+env.Append(LIBS=[ "libgodot-cpp{}{}".format(env["suffix"], env["SHLIBSUFFIX"]), "discord_game_sdk"])
 
 sources = Glob("src/*.cpp")
 if env["platform"] == "macos":
diff --git a/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.exp b/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.exp
deleted file mode 100644
index ff55646..0000000
Binary files a/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.exp and /dev/null differ
diff --git a/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.lib b/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.lib
deleted file mode 100644
index ee7f576..0000000
Binary files a/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.lib and /dev/null differ
diff --git a/project/addons/discord-rpc-gd/discord-rpc-gd.gdextension b/project/addons/discord-rpc-gd/discord-rpc-gd.gdextension
index 9c5f239..3280b50 100644
--- a/project/addons/discord-rpc-gd/discord-rpc-gd.gdextension
+++ b/project/addons/discord-rpc-gd/discord-rpc-gd.gdextension
@@ -20,20 +20,3 @@ android.debug.x86_64 = "bin/libgd-discordrpc.android.template_debug.x86_64.so"
 android.release.x86_64 = "bin/libgd-discordrpc.android.template_release.x86_64.so"
 android.debug.arm64 = "bin/libgd-discordrpc.android.template_debug.arm64.so"
 android.release.arm64 = "bin/libgd-discordrpc.android.template_release.arm64.so"
-
-[dependencies]
-
-windows.debug.x86_32 = "lib/discord_game_sdk.dll"
-windows.release.x86_32 = "lib/discord_game_sdk.dll"
-windows.debug.x86_64 = "lib/discord_game_sdk.dll"
-windows.release.x86_64 = "lib/discord_game_sdk.dll"
-linux.debug.x86_64 = "lib/discord_game_sdk.so"
-linux.release.x86_64 = "lib/discord_game_sdk.so"
-linux.debug.arm64 = "lib/discord_game_sdk.so"
-linux.release.arm64 = "lib/discord_game_sdk.so"
-linux.debug.rv64 = "lib/discord_game_sdk.so"
-linux.release.rv64 = "lib/discord_game_sdk.so"
-android.debug.x86_64 = "lib/discord_game_sdk.so"
-android.release.x86_64 = "lib/discord_game_sdk.so"
-android.debug.arm64 = "lib/discord_game_sdk.so"
-android.release.arm64 = "lib/discord_game_sdk.so"
\ No newline at end of file
diff --git a/project/addons/discord-rpc-gd/lib/discord_game_sdk.bundle b/src/discord-game-sdk-cpp/lib/discord_game_sdk.bundle
similarity index 100%
rename from project/addons/discord-rpc-gd/lib/discord_game_sdk.bundle
rename to src/discord-game-sdk-cpp/lib/discord_game_sdk.bundle
diff --git a/project/addons/discord-rpc-gd/lib/discord_game_sdk.dll b/src/discord-game-sdk-cpp/lib/discord_game_sdk.dll
similarity index 100%
rename from project/addons/discord-rpc-gd/lib/discord_game_sdk.dll
rename to src/discord-game-sdk-cpp/lib/discord_game_sdk.dll
diff --git a/project/addons/discord-rpc-gd/lib/discord_game_sdk.lib b/src/discord-game-sdk-cpp/lib/discord_game_sdk.dll.lib
similarity index 100%
rename from project/addons/discord-rpc-gd/lib/discord_game_sdk.lib
rename to src/discord-game-sdk-cpp/lib/discord_game_sdk.dll.lib
diff --git a/project/addons/discord-rpc-gd/lib/discord_game_sdk.dylib b/src/discord-game-sdk-cpp/lib/discord_game_sdk.dylib
similarity index 100%
rename from project/addons/discord-rpc-gd/lib/discord_game_sdk.dylib
rename to src/discord-game-sdk-cpp/lib/discord_game_sdk.dylib
diff --git a/project/addons/discord-rpc-gd/lib/discord_game_sdk.so b/src/discord-game-sdk-cpp/lib/discord_game_sdk.so
similarity index 100%
rename from project/addons/discord-rpc-gd/lib/discord_game_sdk.so
rename to src/discord-game-sdk-cpp/lib/discord_game_sdk.so
diff --git a/src/main.cpp b/src/main.cpp
index 1740dcc..1b560ef 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,34 +6,30 @@
 using namespace godot;
 using namespace discord;
 
-Core *core{};
+Core* core{};
 
-void DiscordRPC::_bind_methods()
-{
+void DiscordRPC::_bind_methods() {
 }
 
-DiscordRPC::DiscordRPC()
-{
+DiscordRPC::DiscordRPC() {
     // initialize any variables here
     time_passed = 0.0;
 }
 
-DiscordRPC::~DiscordRPC()
-{
+DiscordRPC::~DiscordRPC() {
     // add your cleanup here
 }
 
-void DiscordRPC::_ready()
-{
-    discord::Result res = Core::Create(53908232506183680, DiscordCreateFlags_NoRequireDiscord, &core);
-    Activity activity{};
+void DiscordRPC::_ready() {
+    discord::Result res /*= Core::Create(53908232506183680, DiscordCreateFlags_NoRequireDiscord, &core)*/;
+	Activity activity{};
     UtilityFunctions::print(core);
-    activity.SetState("Testing");
-    activity.SetDetails("Fruit Loops");
-    core->ActivityManager().UpdateActivity(activity, [](Result res) {});
+	/*activity.SetState("Testing");
+	activity.SetDetails("Fruit Loops");
+	core->ActivityManager().UpdateActivity(activity, [](Result res) {
+    });*/
 }
 
-void DiscordRPC::_process(float delta)
-{
-    ::core->RunCallbacks();
+void DiscordRPC::_process(float delta) {
+    //::core->RunCallbacks();
 }
\ No newline at end of file
diff --git a/src/main.windows.template_debug.x86_64.obj b/src/main.windows.template_debug.x86_64.obj
deleted file mode 100644
index 9cf2107..0000000
Binary files a/src/main.windows.template_debug.x86_64.obj and /dev/null differ
diff --git a/src/register_types.windows.template_debug.x86_64.obj b/src/register_types.windows.template_debug.x86_64.obj
deleted file mode 100644
index 9131a9b..0000000
Binary files a/src/register_types.windows.template_debug.x86_64.obj and /dev/null differ