diff --git a/citygml-tools-2.4.0/README.md b/tools/citygml-tools-2.4.0/README.md
similarity index 100%
rename from citygml-tools-2.4.0/README.md
rename to tools/citygml-tools-2.4.0/README.md
diff --git a/citygml-tools-2.4.0/citygml-tools b/tools/citygml-tools-2.4.0/citygml-tools
similarity index 100%
rename from citygml-tools-2.4.0/citygml-tools
rename to tools/citygml-tools-2.4.0/citygml-tools
diff --git a/citygml-tools-2.4.0/citygml-tools.bat b/tools/citygml-tools-2.4.0/citygml-tools.bat
similarity index 100%
rename from citygml-tools-2.4.0/citygml-tools.bat
rename to tools/citygml-tools-2.4.0/citygml-tools.bat
diff --git a/citygml-tools-2.4.0/lib/GeographicLib-Java-1.49.jar b/tools/citygml-tools-2.4.0/lib/GeographicLib-Java-1.49.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/GeographicLib-Java-1.49.jar
rename to tools/citygml-tools-2.4.0/lib/GeographicLib-Java-1.49.jar
diff --git a/citygml-tools-2.4.0/lib/Saxon-HE-12.5.jar b/tools/citygml-tools-2.4.0/lib/Saxon-HE-12.5.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/Saxon-HE-12.5.jar
rename to tools/citygml-tools-2.4.0/lib/Saxon-HE-12.5.jar
diff --git a/citygml-tools-2.4.0/lib/apiguardian-api-1.1.2.jar b/tools/citygml-tools-2.4.0/lib/apiguardian-api-1.1.2.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/apiguardian-api-1.1.2.jar
rename to tools/citygml-tools-2.4.0/lib/apiguardian-api-1.1.2.jar
diff --git a/citygml-tools-2.4.0/lib/citygml-tools-2.4.0.jar b/tools/citygml-tools-2.4.0/lib/citygml-tools-2.4.0.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/citygml-tools-2.4.0.jar
rename to tools/citygml-tools-2.4.0/lib/citygml-tools-2.4.0.jar
diff --git a/citygml-tools-2.4.0/lib/citygml4j-cityjson-3.2.4.jar b/tools/citygml-tools-2.4.0/lib/citygml4j-cityjson-3.2.4.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/citygml4j-cityjson-3.2.4.jar
rename to tools/citygml-tools-2.4.0/lib/citygml4j-cityjson-3.2.4.jar
diff --git a/citygml-tools-2.4.0/lib/citygml4j-core-3.2.4.jar b/tools/citygml-tools-2.4.0/lib/citygml4j-core-3.2.4.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/citygml4j-core-3.2.4.jar
rename to tools/citygml-tools-2.4.0/lib/citygml4j-core-3.2.4.jar
diff --git a/citygml-tools-2.4.0/lib/citygml4j-xml-3.2.4.jar b/tools/citygml-tools-2.4.0/lib/citygml4j-xml-3.2.4.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/citygml4j-xml-3.2.4.jar
rename to tools/citygml-tools-2.4.0/lib/citygml4j-xml-3.2.4.jar
diff --git a/citygml-tools-2.4.0/lib/classindex-3.13.1.jar b/tools/citygml-tools-2.4.0/lib/classindex-3.13.1.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/classindex-3.13.1.jar
rename to tools/citygml-tools-2.4.0/lib/classindex-3.13.1.jar
diff --git a/citygml-tools-2.4.0/lib/commons-codec-1.15.jar b/tools/citygml-tools-2.4.0/lib/commons-codec-1.15.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/commons-codec-1.15.jar
rename to tools/citygml-tools-2.4.0/lib/commons-codec-1.15.jar
diff --git a/citygml-tools-2.4.0/lib/commons-imaging-1.0.0-alpha5.jar b/tools/citygml-tools-2.4.0/lib/commons-imaging-1.0.0-alpha5.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/commons-imaging-1.0.0-alpha5.jar
rename to tools/citygml-tools-2.4.0/lib/commons-imaging-1.0.0-alpha5.jar
diff --git a/citygml-tools-2.4.0/lib/commons-io-2.16.1.jar b/tools/citygml-tools-2.4.0/lib/commons-io-2.16.1.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/commons-io-2.16.1.jar
rename to tools/citygml-tools-2.4.0/lib/commons-io-2.16.1.jar
diff --git a/citygml-tools-2.4.0/lib/commons-lang3-3.17.0.jar b/tools/citygml-tools-2.4.0/lib/commons-lang3-3.17.0.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/commons-lang3-3.17.0.jar
rename to tools/citygml-tools-2.4.0/lib/commons-lang3-3.17.0.jar
diff --git a/citygml-tools-2.4.0/lib/commons-pool-1.5.4.jar b/tools/citygml-tools-2.4.0/lib/commons-pool-1.5.4.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/commons-pool-1.5.4.jar
rename to tools/citygml-tools-2.4.0/lib/commons-pool-1.5.4.jar
diff --git a/citygml-tools-2.4.0/lib/ejml-core-0.41.jar b/tools/citygml-tools-2.4.0/lib/ejml-core-0.41.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/ejml-core-0.41.jar
rename to tools/citygml-tools-2.4.0/lib/ejml-core-0.41.jar
diff --git a/citygml-tools-2.4.0/lib/ejml-ddense-0.41.jar b/tools/citygml-tools-2.4.0/lib/ejml-ddense-0.41.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/ejml-ddense-0.41.jar
rename to tools/citygml-tools-2.4.0/lib/ejml-ddense-0.41.jar
diff --git a/citygml-tools-2.4.0/lib/gml-objects-1.1.5.jar b/tools/citygml-tools-2.4.0/lib/gml-objects-1.1.5.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/gml-objects-1.1.5.jar
rename to tools/citygml-tools-2.4.0/lib/gml-objects-1.1.5.jar
diff --git a/citygml-tools-2.4.0/lib/gt-api-33.0.jar b/tools/citygml-tools-2.4.0/lib/gt-api-33.0.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/gt-api-33.0.jar
rename to tools/citygml-tools-2.4.0/lib/gt-api-33.0.jar
diff --git a/citygml-tools-2.4.0/lib/gt-epsg-extension-33.0.jar b/tools/citygml-tools-2.4.0/lib/gt-epsg-extension-33.0.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/gt-epsg-extension-33.0.jar
rename to tools/citygml-tools-2.4.0/lib/gt-epsg-extension-33.0.jar
diff --git a/citygml-tools-2.4.0/lib/gt-epsg-hsql-33.0.jar b/tools/citygml-tools-2.4.0/lib/gt-epsg-hsql-33.0.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/gt-epsg-hsql-33.0.jar
rename to tools/citygml-tools-2.4.0/lib/gt-epsg-hsql-33.0.jar
diff --git a/citygml-tools-2.4.0/lib/gt-metadata-33.0.jar b/tools/citygml-tools-2.4.0/lib/gt-metadata-33.0.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/gt-metadata-33.0.jar
rename to tools/citygml-tools-2.4.0/lib/gt-metadata-33.0.jar
diff --git a/citygml-tools-2.4.0/lib/gt-referencing-33.0.jar b/tools/citygml-tools-2.4.0/lib/gt-referencing-33.0.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/gt-referencing-33.0.jar
rename to tools/citygml-tools-2.4.0/lib/gt-referencing-33.0.jar
diff --git a/citygml-tools-2.4.0/lib/hsqldb-2.7.2.jar b/tools/citygml-tools-2.4.0/lib/hsqldb-2.7.2.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/hsqldb-2.7.2.jar
rename to tools/citygml-tools-2.4.0/lib/hsqldb-2.7.2.jar
diff --git a/citygml-tools-2.4.0/lib/httpclient5-5.1.3.jar b/tools/citygml-tools-2.4.0/lib/httpclient5-5.1.3.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/httpclient5-5.1.3.jar
rename to tools/citygml-tools-2.4.0/lib/httpclient5-5.1.3.jar
diff --git a/citygml-tools-2.4.0/lib/httpcore5-5.1.3.jar b/tools/citygml-tools-2.4.0/lib/httpcore5-5.1.3.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/httpcore5-5.1.3.jar
rename to tools/citygml-tools-2.4.0/lib/httpcore5-5.1.3.jar
diff --git a/citygml-tools-2.4.0/lib/httpcore5-h2-5.1.3.jar b/tools/citygml-tools-2.4.0/lib/httpcore5-h2-5.1.3.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/httpcore5-h2-5.1.3.jar
rename to tools/citygml-tools-2.4.0/lib/httpcore5-h2-5.1.3.jar
diff --git a/citygml-tools-2.4.0/lib/indriya-2.2.jar b/tools/citygml-tools-2.4.0/lib/indriya-2.2.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/indriya-2.2.jar
rename to tools/citygml-tools-2.4.0/lib/indriya-2.2.jar
diff --git a/citygml-tools-2.4.0/lib/jackson-annotations-2.18.3.jar b/tools/citygml-tools-2.4.0/lib/jackson-annotations-2.18.3.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/jackson-annotations-2.18.3.jar
rename to tools/citygml-tools-2.4.0/lib/jackson-annotations-2.18.3.jar
diff --git a/citygml-tools-2.4.0/lib/jackson-core-2.18.3.jar b/tools/citygml-tools-2.4.0/lib/jackson-core-2.18.3.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/jackson-core-2.18.3.jar
rename to tools/citygml-tools-2.4.0/lib/jackson-core-2.18.3.jar
diff --git a/citygml-tools-2.4.0/lib/jackson-databind-2.18.3.jar b/tools/citygml-tools-2.4.0/lib/jackson-databind-2.18.3.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/jackson-databind-2.18.3.jar
rename to tools/citygml-tools-2.4.0/lib/jackson-databind-2.18.3.jar
diff --git a/citygml-tools-2.4.0/lib/jai_core-1.1.3.jar b/tools/citygml-tools-2.4.0/lib/jai_core-1.1.3.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/jai_core-1.1.3.jar
rename to tools/citygml-tools-2.4.0/lib/jai_core-1.1.3.jar
diff --git a/citygml-tools-2.4.0/lib/jakarta.annotation-api-1.3.4.jar b/tools/citygml-tools-2.4.0/lib/jakarta.annotation-api-1.3.4.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/jakarta.annotation-api-1.3.4.jar
rename to tools/citygml-tools-2.4.0/lib/jakarta.annotation-api-1.3.4.jar
diff --git a/citygml-tools-2.4.0/lib/jakarta.inject-api-2.0.1.jar b/tools/citygml-tools-2.4.0/lib/jakarta.inject-api-2.0.1.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/jakarta.inject-api-2.0.1.jar
rename to tools/citygml-tools-2.4.0/lib/jakarta.inject-api-2.0.1.jar
diff --git a/citygml-tools-2.4.0/lib/jgridshift-core-1.3.jar b/tools/citygml-tools-2.4.0/lib/jgridshift-core-1.3.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/jgridshift-core-1.3.jar
rename to tools/citygml-tools-2.4.0/lib/jgridshift-core-1.3.jar
diff --git a/citygml-tools-2.4.0/lib/jts-core-1.20.0.jar b/tools/citygml-tools-2.4.0/lib/jts-core-1.20.0.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/jts-core-1.20.0.jar
rename to tools/citygml-tools-2.4.0/lib/jts-core-1.20.0.jar
diff --git a/citygml-tools-2.4.0/lib/logging.properties b/tools/citygml-tools-2.4.0/lib/logging.properties
similarity index 100%
rename from citygml-tools-2.4.0/lib/logging.properties
rename to tools/citygml-tools-2.4.0/lib/logging.properties
diff --git a/citygml-tools-2.4.0/lib/net.opengis.ows-33.0.jar b/tools/citygml-tools-2.4.0/lib/net.opengis.ows-33.0.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/net.opengis.ows-33.0.jar
rename to tools/citygml-tools-2.4.0/lib/net.opengis.ows-33.0.jar
diff --git a/citygml-tools-2.4.0/lib/org.eclipse.emf.common-2.15.0.jar b/tools/citygml-tools-2.4.0/lib/org.eclipse.emf.common-2.15.0.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/org.eclipse.emf.common-2.15.0.jar
rename to tools/citygml-tools-2.4.0/lib/org.eclipse.emf.common-2.15.0.jar
diff --git a/citygml-tools-2.4.0/lib/org.eclipse.emf.ecore-2.15.0.jar b/tools/citygml-tools-2.4.0/lib/org.eclipse.emf.ecore-2.15.0.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/org.eclipse.emf.ecore-2.15.0.jar
rename to tools/citygml-tools-2.4.0/lib/org.eclipse.emf.ecore-2.15.0.jar
diff --git a/citygml-tools-2.4.0/lib/org.eclipse.emf.ecore.xmi-2.15.0.jar b/tools/citygml-tools-2.4.0/lib/org.eclipse.emf.ecore.xmi-2.15.0.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/org.eclipse.emf.ecore.xmi-2.15.0.jar
rename to tools/citygml-tools-2.4.0/lib/org.eclipse.emf.ecore.xmi-2.15.0.jar
diff --git a/citygml-tools-2.4.0/lib/org.w3.xlink-33.0.jar b/tools/citygml-tools-2.4.0/lib/org.w3.xlink-33.0.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/org.w3.xlink-33.0.jar
rename to tools/citygml-tools-2.4.0/lib/org.w3.xlink-33.0.jar
diff --git a/citygml-tools-2.4.0/lib/picocli-4.7.7.jar b/tools/citygml-tools-2.4.0/lib/picocli-4.7.7.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/picocli-4.7.7.jar
rename to tools/citygml-tools-2.4.0/lib/picocli-4.7.7.jar
diff --git a/citygml-tools-2.4.0/lib/relaxng-datatype-4.0.5.jar b/tools/citygml-tools-2.4.0/lib/relaxng-datatype-4.0.5.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/relaxng-datatype-4.0.5.jar
rename to tools/citygml-tools-2.4.0/lib/relaxng-datatype-4.0.5.jar
diff --git a/citygml-tools-2.4.0/lib/si-quantity-2.1.jar b/tools/citygml-tools-2.4.0/lib/si-quantity-2.1.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/si-quantity-2.1.jar
rename to tools/citygml-tools-2.4.0/lib/si-quantity-2.1.jar
diff --git a/citygml-tools-2.4.0/lib/si-units-2.1.jar b/tools/citygml-tools-2.4.0/lib/si-units-2.1.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/si-units-2.1.jar
rename to tools/citygml-tools-2.4.0/lib/si-units-2.1.jar
diff --git a/citygml-tools-2.4.0/lib/slf4j-api-1.7.25.jar b/tools/citygml-tools-2.4.0/lib/slf4j-api-1.7.25.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/slf4j-api-1.7.25.jar
rename to tools/citygml-tools-2.4.0/lib/slf4j-api-1.7.25.jar
diff --git a/citygml-tools-2.4.0/lib/stax2-api-4.2.2.jar b/tools/citygml-tools-2.4.0/lib/stax2-api-4.2.2.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/stax2-api-4.2.2.jar
rename to tools/citygml-tools-2.4.0/lib/stax2-api-4.2.2.jar
diff --git a/citygml-tools-2.4.0/lib/systems-common-2.1.jar b/tools/citygml-tools-2.4.0/lib/systems-common-2.1.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/systems-common-2.1.jar
rename to tools/citygml-tools-2.4.0/lib/systems-common-2.1.jar
diff --git a/citygml-tools-2.4.0/lib/unit-api-2.2.jar b/tools/citygml-tools-2.4.0/lib/unit-api-2.2.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/unit-api-2.2.jar
rename to tools/citygml-tools-2.4.0/lib/unit-api-2.2.jar
diff --git a/citygml-tools-2.4.0/lib/uom-lib-common-2.2.jar b/tools/citygml-tools-2.4.0/lib/uom-lib-common-2.2.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/uom-lib-common-2.2.jar
rename to tools/citygml-tools-2.4.0/lib/uom-lib-common-2.2.jar
diff --git a/citygml-tools-2.4.0/lib/woodstox-core-7.1.0.jar b/tools/citygml-tools-2.4.0/lib/woodstox-core-7.1.0.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/woodstox-core-7.1.0.jar
rename to tools/citygml-tools-2.4.0/lib/woodstox-core-7.1.0.jar
diff --git a/citygml-tools-2.4.0/lib/xal-objects-1.1.5.jar b/tools/citygml-tools-2.4.0/lib/xal-objects-1.1.5.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/xal-objects-1.1.5.jar
rename to tools/citygml-tools-2.4.0/lib/xal-objects-1.1.5.jar
diff --git a/citygml-tools-2.4.0/lib/xml-objects-1.1.5.jar b/tools/citygml-tools-2.4.0/lib/xml-objects-1.1.5.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/xml-objects-1.1.5.jar
rename to tools/citygml-tools-2.4.0/lib/xml-objects-1.1.5.jar
diff --git a/citygml-tools-2.4.0/lib/xmlresolver-5.2.2-data.jar b/tools/citygml-tools-2.4.0/lib/xmlresolver-5.2.2-data.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/xmlresolver-5.2.2-data.jar
rename to tools/citygml-tools-2.4.0/lib/xmlresolver-5.2.2-data.jar
diff --git a/citygml-tools-2.4.0/lib/xmlresolver-5.2.2.jar b/tools/citygml-tools-2.4.0/lib/xmlresolver-5.2.2.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/xmlresolver-5.2.2.jar
rename to tools/citygml-tools-2.4.0/lib/xmlresolver-5.2.2.jar
diff --git a/citygml-tools-2.4.0/lib/xsom-4.0.5.jar b/tools/citygml-tools-2.4.0/lib/xsom-4.0.5.jar
similarity index 100%
rename from citygml-tools-2.4.0/lib/xsom-4.0.5.jar
rename to tools/citygml-tools-2.4.0/lib/xsom-4.0.5.jar
diff --git a/citygml-tools-2.4.0/license/LICENSE b/tools/citygml-tools-2.4.0/license/LICENSE
similarity index 100%
rename from citygml-tools-2.4.0/license/LICENSE
rename to tools/citygml-tools-2.4.0/license/LICENSE