diff --git a/jars/fontbox-3.0.3.jar b/jars/lib/fontbox-3.0.3.jar
similarity index 100%
rename from jars/fontbox-3.0.3.jar
rename to jars/lib/fontbox-3.0.3.jar
diff --git a/jars/pdfbox-io-3.0.3.jar b/jars/lib/pdfbox-io-3.0.3.jar
similarity index 100%
rename from jars/pdfbox-io-3.0.3.jar
rename to jars/lib/pdfbox-io-3.0.3.jar
diff --git a/jars/Pdfbox3.xqm b/jars/loader.xqm
similarity index 99%
rename from jars/Pdfbox3.xqm
rename to jars/loader.xqm
index e0c8173..221d5a4 100644
--- a/jars/Pdfbox3.xqm
+++ b/jars/loader.xqm
@@ -7,7 +7,7 @@ requires pdfbox jar on classpath
 @javadoc https://javadoc.io/static/org.apache.pdfbox/pdfbox/3.0.2/
 
 :)
-module namespace pdfbox="org.expkg-zone58.Pdfbox3";
+module namespace pdfbox="org.apache.pdfbox.Loader";
 
 declare namespace Loader ="java:org.apache.pdfbox.Loader"; 
 declare namespace PDFTextStripper = "java:org.apache.pdfbox.text.PDFTextStripper";
diff --git a/lib/pdfbox-3.0.3.fat.jar b/lib/pdfbox-3.0.3.fat.jar
index de57272..f535e5b 100644
Binary files a/lib/pdfbox-3.0.3.fat.jar and b/lib/pdfbox-3.0.3.fat.jar differ
diff --git a/scripts/make-fat-jar.xq b/scripts/make-fat-jar.xq
index e1f0ba9..fe4cfbf 100644
--- a/scripts/make-fat-jar.xq
+++ b/scripts/make-fat-jar.xq
@@ -8,14 +8,14 @@ let $config :=map {
          "manifest-jar" : "pdfbox-3.0.3.jar", 
          "input-dir" :  "C:\Users\mrwhe\git\expkg-zone58\pdfbox\jars\", 
          "output" :  "../lib/pdfbox-3.0.3.fat.jar",
-         "main-class": "org.expkg-zone58.Pdfbox3" 
+         "main-class": "org.apache.pdfbox.Loader" 
          }
 
-let $fat-jar := build:fatjar-from-folder($config?input-dir,$config?manifest-jar)
+let $fat-jar := build:fatjar-with-lib($config?input-dir,$config?manifest-jar)
 
 let $fat-jar:=build:update-manifest($fat-jar, $config?main-class)
 let $name:=replace($config?main-class,"\.","/") || ".xqm"
-let $content:=file:read-binary($config?input-dir || "Pdfbox3.xqm")
+let $content:=file:read-binary($config?input-dir || "loader.xqm")
 let $fat-jar:=archive:update($fat-jar, $name,$content)
 let $output-file := file:resolve-path($config?output, $config?input-dir)
 return (file:write-binary($output-file, $fat-jar),
diff --git a/src/test/test.xqm b/src/test/test.xqm
index dcf2d8b..2426c8e 100644
--- a/src/test/test.xqm
+++ b/src/test/test.xqm
@@ -2,7 +2,7 @@
 
  :)
 module namespace test="urn:expkg-zone58:pdfbox3:tests";
-import module namespace pdfbox="org.expkg-zone58.Pdfbox3";
+import module namespace pdfbox="org.apache.pdfbox.Loader";
 
 declare variable $test:base:=file:base-dir()=>file:parent()=>file:parent();