diff --git a/.gitignore b/.gitignore
index 53b465a..79a845d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,4 +38,7 @@ mono_crash.*.json
 .history/
 
 # Built Visual Studio Code Extensions
-*.vsix
\ No newline at end of file
+*.vsix
+
+# Fork
+Source/.sconsign.dblite
diff --git a/.gitmodules b/.gitmodules
index a811e12..8c36aad 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "Engine/gd"]
 	path = Engine/gd
 	url = https://github.com/godotengine/godot
+[submodule "Engine/gdnative_cpp"]
+	path = Engine/gdnative_cpp
+	url = https://github.com/godotengine/godot-cpp
diff --git a/Engine/gdnative_cpp b/Engine/gdnative_cpp
new file mode 160000
index 0000000..95a2303
--- /dev/null
+++ b/Engine/gdnative_cpp
@@ -0,0 +1 @@
+Subproject commit 95a2303e37fd28b20c2e53f82e867f5a08e1af53
diff --git a/Source/.sconsign.dblite b/Source/.sconsign.dblite
deleted file mode 100644
index 6744373..0000000
Binary files a/Source/.sconsign.dblite and /dev/null differ
diff --git a/Source/SConstruct b/Source/SConstruct
index 31eb96c..c056334 100644
--- a/Source/SConstruct
+++ b/Source/SConstruct
@@ -18,10 +18,13 @@ opts.Add(PathVariable('target_path', 'The path where the lib is installed.', Pro
 opts.Add(PathVariable('target_name', 'The library name.', 'libgdexample', PathVariable.PathAccept))
 
 # Local dependency paths, adapt them to your setup
-godot_headers_path = ProjPath + "/Engine/gdnative_cpp/godot-headers/"
-cpp_bindings_path = ProjPath + "/Engine/gdnative_cpp/"
+godot_headers_path = ProjPath + "/Engine/gdnative_cpp/godot_cpp/godot-headers/"
+cpp_bindings_path = ProjPath + "/Engine/gdnative_cpp/godot_cpp/"
 cpp_library = "libgodot-cpp"
 
+GDNative_Src = ProjPath + '/Engine/gdnative_cpp/godot_cpp/src/*.cpp'
+Src = ProjPath + "/Source/*.cpp"
+
 # only support 64 at this time..
 bits = 64
 
@@ -100,16 +103,13 @@ env.Append(CPPPATH=['.', godot_headers_path, cpp_bindings_path + 'include/', cpp
 env.Append(LIBPATH=[cpp_bindings_path + 'bin/'])
 env.Append(LIBS=[cpp_library])
 
-GDNative_Src = ProjPath + '/Engine/gdnative_cpp/src/*.cpp'
-Src = ProjPath + "/Source/*.cpp"
-
 # tweak this if you want to use different folders, or more folders, to store your source code in.
 env.Append(CPPPATH=[GDNative_Src])
 env.Append(CPPPATH=[Src])
 sources = Glob(GDNative_Src, Src)
+test = "Sources: ".join(sources)
+print(test);
 
-
-print(sources);
 library = env.SharedLibrary(target=env['target_path'] + env['target_name'] , source=sources)
 
 Default(library)
diff --git a/Source/vc140.idb b/Source/vc140.idb
index 5b5d207..78d3ebd 100644
Binary files a/Source/vc140.idb and b/Source/vc140.idb differ
diff --git a/Source/vc140.pdb b/Source/vc140.pdb
index 387f84b..d84f375 100644
Binary files a/Source/vc140.pdb and b/Source/vc140.pdb differ