diff --git a/.github/workflows/typelib.yml b/.github/workflows/typelib.yml
index 414f584..c7cb93d 100644
--- a/.github/workflows/typelib.yml
+++ b/.github/workflows/typelib.yml
@@ -37,6 +37,6 @@ jobs:
         run: |
           cd lib/tools && ./ci.sh && cd ../..
 
-      - uses: actions/upload-artifact@v4.3.3
+      - uses: peter-evans/create-pull-request@v6
         with:
-          path: lib/tools/gir-files/*.typelib
+          add-paths: lib/girepository-1.0/*.typelib
diff --git a/lib/girepository-1.0/.gitignore b/lib/girepository-1.0/.gitignore
index e4961a1..059bc92 100644
--- a/lib/girepository-1.0/.gitignore
+++ b/lib/girepository-1.0/.gitignore
@@ -1 +1,4 @@
-*.typelib
+*
+!*.sh
+!*.patch
+!*.typelib
\ No newline at end of file
diff --git a/lib/tools/ci.sh b/lib/girepository-1.0/ci.sh
similarity index 89%
rename from lib/tools/ci.sh
rename to lib/girepository-1.0/ci.sh
index a738bb9..9894804 100755
--- a/lib/tools/ci.sh
+++ b/lib/girepository-1.0/ci.sh
@@ -16,6 +16,6 @@ sed 's/gconstpointer/gpointer/' -i Pango-1.0.gir
 for gir in $(ls *.gir)
 do
     typelib=$(echo ${gir} | sed 's/.gir/.typelib/')
-    g-ir-compiler ${gir} -o ${typelib} --includedir .
+    g-ir-compiler ${gir} -o ../${typelib} --includedir .
 done
 cd ..
\ No newline at end of file
diff --git a/lib/tools/girnode.patch b/lib/girepository-1.0/girnode.patch
similarity index 100%
rename from lib/tools/girnode.patch
rename to lib/girepository-1.0/girnode.patch
diff --git a/lib/tools/.gitignore b/lib/tools/.gitignore
deleted file mode 100644
index ed392d2..0000000
--- a/lib/tools/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-g-ir-compiler
-gobject-introspection/
diff --git a/lib/tools/fetch-compiler.sh b/lib/tools/fetch-compiler.sh
deleted file mode 100755
index 455338a..0000000
--- a/lib/tools/fetch-compiler.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/bash
-git clone https://github.com/GNOME/gobject-introspection.git && cd gobject-introspection
-git checkout 1.74.0 #debian stable
-patch girepository/girnode.c ../girnode.patch
-meson setup build && cd build
-meson compile
diff --git a/lib/tools/generate.sh b/lib/tools/generate.sh
deleted file mode 100755
index 6a43943..0000000
--- a/lib/tools/generate.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/bash
-compiler=$(pwd)/gobject-introspection/build/tools/g-ir-compiler
-typelibdir=$(pwd)/../girepository-1.0
-
-#girdir=/usr/share/gir-1.0
-girdir=gir-files
-cd ${girdir}
-
-for gir in $(ls *.gir)
-do
-    typelib=$(echo ${gir} | sed 's/.gir/.typelib/')
-    ${compiler} ${gir} -o ${typelibdir}/${typelib} --includedir .
-done