diff --git a/pom.xml b/pom.xml
index c6f8196447015286215a327317b897a21bfc8b59..65c651cab8b7305688968ac4c6ed198ee261f62f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,17 +7,29 @@
     <parent>
         <groupId>org.bioimageanalysis.icy</groupId>
         <artifactId>pom-icy</artifactId>
-        <version>2.1.3</version>
+        <version>2.2.0</version>
     </parent>
 
     <artifactId>vecmath</artifactId>
-    <version>1.6.1</version>
+    <version>2.0.0</version>
 
     <packaging>jar</packaging>
 
     <name>Vecmath</name>
     <description>Provides 3D vector mathematics classes.</description>
 
+    <properties>
+        <artifact-to-extract>vecmath</artifact-to-extract>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.vecmath</groupId>
+            <artifactId>vecmath</artifactId>
+            <version>1.5.2</version>
+        </dependency>
+    </dependencies>
+
     <repositories>
         <repository>
             <id>icy</id>
diff --git a/src/main/resources/COPYRIGHT.txt b/src/main/resources_old/COPYRIGHT.txt
similarity index 100%
rename from src/main/resources/COPYRIGHT.txt
rename to src/main/resources_old/COPYRIGHT.txt
diff --git a/src/main/resources/LICENSE.txt b/src/main/resources_old/LICENSE.txt
similarity index 100%
rename from src/main/resources/LICENSE.txt
rename to src/main/resources_old/LICENSE.txt
diff --git a/src/main/resources/icon.png b/src/main/resources_old/icon.png
similarity index 100%
rename from src/main/resources/icon.png
rename to src/main/resources_old/icon.png
diff --git a/src/main/resources/javax/vecmath/AxisAngle4d.class b/src/main/resources_old/javax/vecmath/AxisAngle4d.class
similarity index 100%
rename from src/main/resources/javax/vecmath/AxisAngle4d.class
rename to src/main/resources_old/javax/vecmath/AxisAngle4d.class
diff --git a/src/main/resources/javax/vecmath/AxisAngle4f.class b/src/main/resources_old/javax/vecmath/AxisAngle4f.class
similarity index 100%
rename from src/main/resources/javax/vecmath/AxisAngle4f.class
rename to src/main/resources_old/javax/vecmath/AxisAngle4f.class
diff --git a/src/main/resources/javax/vecmath/Color3b.class b/src/main/resources_old/javax/vecmath/Color3b.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Color3b.class
rename to src/main/resources_old/javax/vecmath/Color3b.class
diff --git a/src/main/resources/javax/vecmath/Color3f.class b/src/main/resources_old/javax/vecmath/Color3f.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Color3f.class
rename to src/main/resources_old/javax/vecmath/Color3f.class
diff --git a/src/main/resources/javax/vecmath/Color4b.class b/src/main/resources_old/javax/vecmath/Color4b.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Color4b.class
rename to src/main/resources_old/javax/vecmath/Color4b.class
diff --git a/src/main/resources/javax/vecmath/Color4f.class b/src/main/resources_old/javax/vecmath/Color4f.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Color4f.class
rename to src/main/resources_old/javax/vecmath/Color4f.class
diff --git a/src/main/resources/javax/vecmath/ExceptionStrings.properties b/src/main/resources_old/javax/vecmath/ExceptionStrings.properties
similarity index 100%
rename from src/main/resources/javax/vecmath/ExceptionStrings.properties
rename to src/main/resources_old/javax/vecmath/ExceptionStrings.properties
diff --git a/src/main/resources/javax/vecmath/GMatrix.class b/src/main/resources_old/javax/vecmath/GMatrix.class
similarity index 100%
rename from src/main/resources/javax/vecmath/GMatrix.class
rename to src/main/resources_old/javax/vecmath/GMatrix.class
diff --git a/src/main/resources/javax/vecmath/GVector.class b/src/main/resources_old/javax/vecmath/GVector.class
similarity index 100%
rename from src/main/resources/javax/vecmath/GVector.class
rename to src/main/resources_old/javax/vecmath/GVector.class
diff --git a/src/main/resources/javax/vecmath/Matrix3d.class b/src/main/resources_old/javax/vecmath/Matrix3d.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Matrix3d.class
rename to src/main/resources_old/javax/vecmath/Matrix3d.class
diff --git a/src/main/resources/javax/vecmath/Matrix3f.class b/src/main/resources_old/javax/vecmath/Matrix3f.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Matrix3f.class
rename to src/main/resources_old/javax/vecmath/Matrix3f.class
diff --git a/src/main/resources/javax/vecmath/Matrix4d.class b/src/main/resources_old/javax/vecmath/Matrix4d.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Matrix4d.class
rename to src/main/resources_old/javax/vecmath/Matrix4d.class
diff --git a/src/main/resources/javax/vecmath/Matrix4f.class b/src/main/resources_old/javax/vecmath/Matrix4f.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Matrix4f.class
rename to src/main/resources_old/javax/vecmath/Matrix4f.class
diff --git a/src/main/resources/javax/vecmath/MismatchedSizeException.class b/src/main/resources_old/javax/vecmath/MismatchedSizeException.class
similarity index 100%
rename from src/main/resources/javax/vecmath/MismatchedSizeException.class
rename to src/main/resources_old/javax/vecmath/MismatchedSizeException.class
diff --git a/src/main/resources/javax/vecmath/Point2d.class b/src/main/resources_old/javax/vecmath/Point2d.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Point2d.class
rename to src/main/resources_old/javax/vecmath/Point2d.class
diff --git a/src/main/resources/javax/vecmath/Point2f.class b/src/main/resources_old/javax/vecmath/Point2f.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Point2f.class
rename to src/main/resources_old/javax/vecmath/Point2f.class
diff --git a/src/main/resources/javax/vecmath/Point2i.class b/src/main/resources_old/javax/vecmath/Point2i.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Point2i.class
rename to src/main/resources_old/javax/vecmath/Point2i.class
diff --git a/src/main/resources/javax/vecmath/Point3d.class b/src/main/resources_old/javax/vecmath/Point3d.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Point3d.class
rename to src/main/resources_old/javax/vecmath/Point3d.class
diff --git a/src/main/resources/javax/vecmath/Point3f.class b/src/main/resources_old/javax/vecmath/Point3f.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Point3f.class
rename to src/main/resources_old/javax/vecmath/Point3f.class
diff --git a/src/main/resources/javax/vecmath/Point3i.class b/src/main/resources_old/javax/vecmath/Point3i.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Point3i.class
rename to src/main/resources_old/javax/vecmath/Point3i.class
diff --git a/src/main/resources/javax/vecmath/Point4d.class b/src/main/resources_old/javax/vecmath/Point4d.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Point4d.class
rename to src/main/resources_old/javax/vecmath/Point4d.class
diff --git a/src/main/resources/javax/vecmath/Point4f.class b/src/main/resources_old/javax/vecmath/Point4f.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Point4f.class
rename to src/main/resources_old/javax/vecmath/Point4f.class
diff --git a/src/main/resources/javax/vecmath/Point4i.class b/src/main/resources_old/javax/vecmath/Point4i.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Point4i.class
rename to src/main/resources_old/javax/vecmath/Point4i.class
diff --git a/src/main/resources/javax/vecmath/Quat4d.class b/src/main/resources_old/javax/vecmath/Quat4d.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Quat4d.class
rename to src/main/resources_old/javax/vecmath/Quat4d.class
diff --git a/src/main/resources/javax/vecmath/Quat4f.class b/src/main/resources_old/javax/vecmath/Quat4f.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Quat4f.class
rename to src/main/resources_old/javax/vecmath/Quat4f.class
diff --git a/src/main/resources/javax/vecmath/SingularMatrixException.class b/src/main/resources_old/javax/vecmath/SingularMatrixException.class
similarity index 100%
rename from src/main/resources/javax/vecmath/SingularMatrixException.class
rename to src/main/resources_old/javax/vecmath/SingularMatrixException.class
diff --git a/src/main/resources/javax/vecmath/TexCoord2f.class b/src/main/resources_old/javax/vecmath/TexCoord2f.class
similarity index 100%
rename from src/main/resources/javax/vecmath/TexCoord2f.class
rename to src/main/resources_old/javax/vecmath/TexCoord2f.class
diff --git a/src/main/resources/javax/vecmath/TexCoord3f.class b/src/main/resources_old/javax/vecmath/TexCoord3f.class
similarity index 100%
rename from src/main/resources/javax/vecmath/TexCoord3f.class
rename to src/main/resources_old/javax/vecmath/TexCoord3f.class
diff --git a/src/main/resources/javax/vecmath/TexCoord4f.class b/src/main/resources_old/javax/vecmath/TexCoord4f.class
similarity index 100%
rename from src/main/resources/javax/vecmath/TexCoord4f.class
rename to src/main/resources_old/javax/vecmath/TexCoord4f.class
diff --git a/src/main/resources/javax/vecmath/Tuple2d.class b/src/main/resources_old/javax/vecmath/Tuple2d.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Tuple2d.class
rename to src/main/resources_old/javax/vecmath/Tuple2d.class
diff --git a/src/main/resources/javax/vecmath/Tuple2f.class b/src/main/resources_old/javax/vecmath/Tuple2f.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Tuple2f.class
rename to src/main/resources_old/javax/vecmath/Tuple2f.class
diff --git a/src/main/resources/javax/vecmath/Tuple2i.class b/src/main/resources_old/javax/vecmath/Tuple2i.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Tuple2i.class
rename to src/main/resources_old/javax/vecmath/Tuple2i.class
diff --git a/src/main/resources/javax/vecmath/Tuple3b.class b/src/main/resources_old/javax/vecmath/Tuple3b.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Tuple3b.class
rename to src/main/resources_old/javax/vecmath/Tuple3b.class
diff --git a/src/main/resources/javax/vecmath/Tuple3d.class b/src/main/resources_old/javax/vecmath/Tuple3d.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Tuple3d.class
rename to src/main/resources_old/javax/vecmath/Tuple3d.class
diff --git a/src/main/resources/javax/vecmath/Tuple3f.class b/src/main/resources_old/javax/vecmath/Tuple3f.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Tuple3f.class
rename to src/main/resources_old/javax/vecmath/Tuple3f.class
diff --git a/src/main/resources/javax/vecmath/Tuple3i.class b/src/main/resources_old/javax/vecmath/Tuple3i.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Tuple3i.class
rename to src/main/resources_old/javax/vecmath/Tuple3i.class
diff --git a/src/main/resources/javax/vecmath/Tuple4b.class b/src/main/resources_old/javax/vecmath/Tuple4b.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Tuple4b.class
rename to src/main/resources_old/javax/vecmath/Tuple4b.class
diff --git a/src/main/resources/javax/vecmath/Tuple4d.class b/src/main/resources_old/javax/vecmath/Tuple4d.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Tuple4d.class
rename to src/main/resources_old/javax/vecmath/Tuple4d.class
diff --git a/src/main/resources/javax/vecmath/Tuple4f.class b/src/main/resources_old/javax/vecmath/Tuple4f.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Tuple4f.class
rename to src/main/resources_old/javax/vecmath/Tuple4f.class
diff --git a/src/main/resources/javax/vecmath/Tuple4i.class b/src/main/resources_old/javax/vecmath/Tuple4i.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Tuple4i.class
rename to src/main/resources_old/javax/vecmath/Tuple4i.class
diff --git a/src/main/resources/javax/vecmath/VecMathI18N.class b/src/main/resources_old/javax/vecmath/VecMathI18N.class
similarity index 100%
rename from src/main/resources/javax/vecmath/VecMathI18N.class
rename to src/main/resources_old/javax/vecmath/VecMathI18N.class
diff --git a/src/main/resources/javax/vecmath/VecMathUtil.class b/src/main/resources_old/javax/vecmath/VecMathUtil.class
similarity index 100%
rename from src/main/resources/javax/vecmath/VecMathUtil.class
rename to src/main/resources_old/javax/vecmath/VecMathUtil.class
diff --git a/src/main/resources/javax/vecmath/Vector2d.class b/src/main/resources_old/javax/vecmath/Vector2d.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Vector2d.class
rename to src/main/resources_old/javax/vecmath/Vector2d.class
diff --git a/src/main/resources/javax/vecmath/Vector2f.class b/src/main/resources_old/javax/vecmath/Vector2f.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Vector2f.class
rename to src/main/resources_old/javax/vecmath/Vector2f.class
diff --git a/src/main/resources/javax/vecmath/Vector3d.class b/src/main/resources_old/javax/vecmath/Vector3d.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Vector3d.class
rename to src/main/resources_old/javax/vecmath/Vector3d.class
diff --git a/src/main/resources/javax/vecmath/Vector3f.class b/src/main/resources_old/javax/vecmath/Vector3f.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Vector3f.class
rename to src/main/resources_old/javax/vecmath/Vector3f.class
diff --git a/src/main/resources/javax/vecmath/Vector4d.class b/src/main/resources_old/javax/vecmath/Vector4d.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Vector4d.class
rename to src/main/resources_old/javax/vecmath/Vector4d.class
diff --git a/src/main/resources/javax/vecmath/Vector4f.class b/src/main/resources_old/javax/vecmath/Vector4f.class
similarity index 100%
rename from src/main/resources/javax/vecmath/Vector4f.class
rename to src/main/resources_old/javax/vecmath/Vector4f.class