diff --git a/SConstruct b/SConstruct
index 7cf973d..e3fac3a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -43,6 +43,7 @@ elif env['platform'] == "windows":
 
 # make sure our binding library is properly includes
 env.Append(LIBPATH=[discord_lib_path])
+sources = Glob('src/discord-game-sdk-cpp/*.cpp')
 env.Append(CPPPATH=['src/discord-game-sdk-cpp'])
 env.Append(LIBS=[
     discord_library.replace(".dll", "")
@@ -50,7 +51,7 @@ env.Append(LIBS=[
 
 # tweak this if you want to use different folders, or more folders, to store your source code in.
 env.Append(CPPPATH=['src/'])
-sources = Glob('src/*.cpp')
+sources += Glob('src/*.cpp')
 
 library = env.SharedLibrary(target="project/addons/discord-rpc-gd/bin/libgd-discordrpc" + env["suffix"] + env["SHLIBSUFFIX"], source=sources)
 #env.Depends(library, Command("project/addons/discord-rpc-gd/bin/" + discord_library, discord_lib_path + "/" + discord_library, Copy("$TARGET", "$SOURCE")))
diff --git a/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.dll b/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.dll
index 9406b39..ca82f96 100644
Binary files a/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.dll and b/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.dll differ
diff --git a/src/achievement_manager.cpp b/src/discord-game-sdk-cpp/achievement_manager.cpp
similarity index 100%
rename from src/achievement_manager.cpp
rename to src/discord-game-sdk-cpp/achievement_manager.cpp
diff --git a/src/achievement_manager.h b/src/discord-game-sdk-cpp/achievement_manager.h
similarity index 100%
rename from src/achievement_manager.h
rename to src/discord-game-sdk-cpp/achievement_manager.h
diff --git a/src/achievement_manager.windows.template_debug.x86_64.obj b/src/discord-game-sdk-cpp/achievement_manager.windows.template_debug.x86_64.obj
similarity index 100%
rename from src/achievement_manager.windows.template_debug.x86_64.obj
rename to src/discord-game-sdk-cpp/achievement_manager.windows.template_debug.x86_64.obj
diff --git a/src/activity_manager.cpp b/src/discord-game-sdk-cpp/activity_manager.cpp
similarity index 100%
rename from src/activity_manager.cpp
rename to src/discord-game-sdk-cpp/activity_manager.cpp
diff --git a/src/activity_manager.h b/src/discord-game-sdk-cpp/activity_manager.h
similarity index 100%
rename from src/activity_manager.h
rename to src/discord-game-sdk-cpp/activity_manager.h
diff --git a/src/activity_manager.windows.template_debug.x86_64.obj b/src/discord-game-sdk-cpp/activity_manager.windows.template_debug.x86_64.obj
similarity index 100%
rename from src/activity_manager.windows.template_debug.x86_64.obj
rename to src/discord-game-sdk-cpp/activity_manager.windows.template_debug.x86_64.obj
diff --git a/src/application_manager.cpp b/src/discord-game-sdk-cpp/application_manager.cpp
similarity index 100%
rename from src/application_manager.cpp
rename to src/discord-game-sdk-cpp/application_manager.cpp
diff --git a/src/application_manager.h b/src/discord-game-sdk-cpp/application_manager.h
similarity index 100%
rename from src/application_manager.h
rename to src/discord-game-sdk-cpp/application_manager.h
diff --git a/src/application_manager.windows.template_debug.x86_64.obj b/src/discord-game-sdk-cpp/application_manager.windows.template_debug.x86_64.obj
similarity index 100%
rename from src/application_manager.windows.template_debug.x86_64.obj
rename to src/discord-game-sdk-cpp/application_manager.windows.template_debug.x86_64.obj
diff --git a/src/core.cpp b/src/discord-game-sdk-cpp/core.cpp
similarity index 100%
rename from src/core.cpp
rename to src/discord-game-sdk-cpp/core.cpp
diff --git a/src/core.h b/src/discord-game-sdk-cpp/core.h
similarity index 100%
rename from src/core.h
rename to src/discord-game-sdk-cpp/core.h
diff --git a/src/core.windows.template_debug.x86_64.obj b/src/discord-game-sdk-cpp/core.windows.template_debug.x86_64.obj
similarity index 100%
rename from src/core.windows.template_debug.x86_64.obj
rename to src/discord-game-sdk-cpp/core.windows.template_debug.x86_64.obj
diff --git a/src/discord.h b/src/discord-game-sdk-cpp/discord.h
similarity index 100%
rename from src/discord.h
rename to src/discord-game-sdk-cpp/discord.h
diff --git a/src/event.h b/src/discord-game-sdk-cpp/event.h
similarity index 100%
rename from src/event.h
rename to src/discord-game-sdk-cpp/event.h
diff --git a/src/ffi.h b/src/discord-game-sdk-cpp/ffi.h
similarity index 100%
rename from src/ffi.h
rename to src/discord-game-sdk-cpp/ffi.h
diff --git a/src/image_manager.cpp b/src/discord-game-sdk-cpp/image_manager.cpp
similarity index 100%
rename from src/image_manager.cpp
rename to src/discord-game-sdk-cpp/image_manager.cpp
diff --git a/src/image_manager.h b/src/discord-game-sdk-cpp/image_manager.h
similarity index 100%
rename from src/image_manager.h
rename to src/discord-game-sdk-cpp/image_manager.h
diff --git a/src/image_manager.windows.template_debug.x86_64.obj b/src/discord-game-sdk-cpp/image_manager.windows.template_debug.x86_64.obj
similarity index 100%
rename from src/image_manager.windows.template_debug.x86_64.obj
rename to src/discord-game-sdk-cpp/image_manager.windows.template_debug.x86_64.obj
diff --git a/src/lobby_manager.cpp b/src/discord-game-sdk-cpp/lobby_manager.cpp
similarity index 100%
rename from src/lobby_manager.cpp
rename to src/discord-game-sdk-cpp/lobby_manager.cpp
diff --git a/src/lobby_manager.h b/src/discord-game-sdk-cpp/lobby_manager.h
similarity index 100%
rename from src/lobby_manager.h
rename to src/discord-game-sdk-cpp/lobby_manager.h
diff --git a/src/lobby_manager.windows.template_debug.x86_64.obj b/src/discord-game-sdk-cpp/lobby_manager.windows.template_debug.x86_64.obj
similarity index 100%
rename from src/lobby_manager.windows.template_debug.x86_64.obj
rename to src/discord-game-sdk-cpp/lobby_manager.windows.template_debug.x86_64.obj
diff --git a/src/network_manager.cpp b/src/discord-game-sdk-cpp/network_manager.cpp
similarity index 100%
rename from src/network_manager.cpp
rename to src/discord-game-sdk-cpp/network_manager.cpp
diff --git a/src/network_manager.h b/src/discord-game-sdk-cpp/network_manager.h
similarity index 100%
rename from src/network_manager.h
rename to src/discord-game-sdk-cpp/network_manager.h
diff --git a/src/network_manager.windows.template_debug.x86_64.obj b/src/discord-game-sdk-cpp/network_manager.windows.template_debug.x86_64.obj
similarity index 100%
rename from src/network_manager.windows.template_debug.x86_64.obj
rename to src/discord-game-sdk-cpp/network_manager.windows.template_debug.x86_64.obj
diff --git a/src/overlay_manager.cpp b/src/discord-game-sdk-cpp/overlay_manager.cpp
similarity index 100%
rename from src/overlay_manager.cpp
rename to src/discord-game-sdk-cpp/overlay_manager.cpp
diff --git a/src/overlay_manager.h b/src/discord-game-sdk-cpp/overlay_manager.h
similarity index 100%
rename from src/overlay_manager.h
rename to src/discord-game-sdk-cpp/overlay_manager.h
diff --git a/src/overlay_manager.windows.template_debug.x86_64.obj b/src/discord-game-sdk-cpp/overlay_manager.windows.template_debug.x86_64.obj
similarity index 100%
rename from src/overlay_manager.windows.template_debug.x86_64.obj
rename to src/discord-game-sdk-cpp/overlay_manager.windows.template_debug.x86_64.obj
diff --git a/src/relationship_manager.cpp b/src/discord-game-sdk-cpp/relationship_manager.cpp
similarity index 100%
rename from src/relationship_manager.cpp
rename to src/discord-game-sdk-cpp/relationship_manager.cpp
diff --git a/src/relationship_manager.h b/src/discord-game-sdk-cpp/relationship_manager.h
similarity index 100%
rename from src/relationship_manager.h
rename to src/discord-game-sdk-cpp/relationship_manager.h
diff --git a/src/relationship_manager.windows.template_debug.x86_64.obj b/src/discord-game-sdk-cpp/relationship_manager.windows.template_debug.x86_64.obj
similarity index 100%
rename from src/relationship_manager.windows.template_debug.x86_64.obj
rename to src/discord-game-sdk-cpp/relationship_manager.windows.template_debug.x86_64.obj
diff --git a/src/storage_manager.cpp b/src/discord-game-sdk-cpp/storage_manager.cpp
similarity index 100%
rename from src/storage_manager.cpp
rename to src/discord-game-sdk-cpp/storage_manager.cpp
diff --git a/src/storage_manager.h b/src/discord-game-sdk-cpp/storage_manager.h
similarity index 100%
rename from src/storage_manager.h
rename to src/discord-game-sdk-cpp/storage_manager.h
diff --git a/src/storage_manager.windows.template_debug.x86_64.obj b/src/discord-game-sdk-cpp/storage_manager.windows.template_debug.x86_64.obj
similarity index 100%
rename from src/storage_manager.windows.template_debug.x86_64.obj
rename to src/discord-game-sdk-cpp/storage_manager.windows.template_debug.x86_64.obj
diff --git a/src/store_manager.cpp b/src/discord-game-sdk-cpp/store_manager.cpp
similarity index 100%
rename from src/store_manager.cpp
rename to src/discord-game-sdk-cpp/store_manager.cpp
diff --git a/src/store_manager.h b/src/discord-game-sdk-cpp/store_manager.h
similarity index 100%
rename from src/store_manager.h
rename to src/discord-game-sdk-cpp/store_manager.h
diff --git a/src/store_manager.windows.template_debug.x86_64.obj b/src/discord-game-sdk-cpp/store_manager.windows.template_debug.x86_64.obj
similarity index 100%
rename from src/store_manager.windows.template_debug.x86_64.obj
rename to src/discord-game-sdk-cpp/store_manager.windows.template_debug.x86_64.obj
diff --git a/src/types.cpp b/src/discord-game-sdk-cpp/types.cpp
similarity index 100%
rename from src/types.cpp
rename to src/discord-game-sdk-cpp/types.cpp
diff --git a/src/types.h b/src/discord-game-sdk-cpp/types.h
similarity index 100%
rename from src/types.h
rename to src/discord-game-sdk-cpp/types.h
diff --git a/src/types.windows.template_debug.x86_64.obj b/src/discord-game-sdk-cpp/types.windows.template_debug.x86_64.obj
similarity index 100%
rename from src/types.windows.template_debug.x86_64.obj
rename to src/discord-game-sdk-cpp/types.windows.template_debug.x86_64.obj
diff --git a/src/user_manager.cpp b/src/discord-game-sdk-cpp/user_manager.cpp
similarity index 100%
rename from src/user_manager.cpp
rename to src/discord-game-sdk-cpp/user_manager.cpp
diff --git a/src/user_manager.h b/src/discord-game-sdk-cpp/user_manager.h
similarity index 100%
rename from src/user_manager.h
rename to src/discord-game-sdk-cpp/user_manager.h
diff --git a/src/user_manager.windows.template_debug.x86_64.obj b/src/discord-game-sdk-cpp/user_manager.windows.template_debug.x86_64.obj
similarity index 100%
rename from src/user_manager.windows.template_debug.x86_64.obj
rename to src/discord-game-sdk-cpp/user_manager.windows.template_debug.x86_64.obj
diff --git a/src/voice_manager.cpp b/src/discord-game-sdk-cpp/voice_manager.cpp
similarity index 100%
rename from src/voice_manager.cpp
rename to src/discord-game-sdk-cpp/voice_manager.cpp
diff --git a/src/voice_manager.h b/src/discord-game-sdk-cpp/voice_manager.h
similarity index 100%
rename from src/voice_manager.h
rename to src/discord-game-sdk-cpp/voice_manager.h
diff --git a/src/voice_manager.windows.template_debug.x86_64.obj b/src/discord-game-sdk-cpp/voice_manager.windows.template_debug.x86_64.obj
similarity index 100%
rename from src/voice_manager.windows.template_debug.x86_64.obj
rename to src/discord-game-sdk-cpp/voice_manager.windows.template_debug.x86_64.obj
diff --git a/src/main.cpp b/src/main.cpp
index 0c08c48..5ba6777 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,7 @@
 #include "main.h"
 #include <godot_cpp/core/class_db.hpp>
 #include <godot_cpp/variant/utility_functions.hpp>
-#include "discord.h"
+#include "discord-game-sdk-cpp/discord.h"
 
 using namespace godot;
 
diff --git a/src/main.h b/src/main.h
index ebf548c..fb83d37 100644
--- a/src/main.h
+++ b/src/main.h
@@ -2,7 +2,6 @@
 #define DISCORDRPC_H
 
 #include <godot_cpp/classes/node.hpp>
-#include "discord.h"
 
 namespace godot
 {
diff --git a/src/main.windows.template_debug.x86_64.obj b/src/main.windows.template_debug.x86_64.obj
index 3444e72..4d9bb30 100644
Binary files a/src/main.windows.template_debug.x86_64.obj and b/src/main.windows.template_debug.x86_64.obj differ
diff --git a/src/main.windows.template_release.x86_64.obj b/src/main.windows.template_release.x86_64.obj
deleted file mode 100644
index 40596d8..0000000
Binary files a/src/main.windows.template_release.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
index 59c6ac9..e798a04 100644
Binary files a/src/register_types.windows.template_debug.x86_64.obj and b/src/register_types.windows.template_debug.x86_64.obj differ
diff --git a/src/register_types.windows.template_release.x86_64.obj b/src/register_types.windows.template_release.x86_64.obj
deleted file mode 100644
index 5a9c6f4..0000000
Binary files a/src/register_types.windows.template_release.x86_64.obj and /dev/null differ