diff --git a/.github/workflows/main.linux.temurin.lts.yml b/.github/workflows/main.linux.temurin.lts.yml
index fd8b57e..6a39901 100644
--- a/.github/workflows/main.linux.temurin.lts.yml
+++ b/.github/workflows/main.linux.temurin.lts.yml
@@ -25,6 +25,7 @@ jobs:
           name: test-logs
           path: ./com.io7m.dixmont.tests/target/surefire-reports
       - name: Coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4.3.0
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           file: com.io7m.dixmont.tests/target/site/jacoco-aggregate/jacoco.xml
diff --git a/.gitmodules b/.gitmodules
index e8d95e0..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule ".jenkins"]
-	path = .jenkins
-	url = https://www.github.com/io7m/jenkinsfiles
diff --git a/.jenkins b/.jenkins
deleted file mode 160000
index 3213e21..0000000
--- a/.jenkins
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3213e21cdb5549e59c16e21658a9e87443301c7e
diff --git a/README.in b/README.in
index 91c89a8..c40ac6f 100644
--- a/README.in
+++ b/README.in
@@ -6,7 +6,7 @@ Some useful extension classes for [jackson](https://github.com/FasterXML/jackson
 ### Features
 
   * Restricted JSON deserializer for preventing reflection-based serialization attacks.
-  * Written in pure Java 17.
+  * Written in pure Java 21.
   * [OSGi](https://www.osgi.org/) ready.
   * [JPMS](https://en.wikipedia.org/wiki/Java_Platform_Module_System) ready.
   * ISC license.
diff --git a/README.md b/README.md
index 873645f..6d47881 100644
--- a/README.md
+++ b/README.md
@@ -3,16 +3,16 @@ dixmont
 
 [![Maven Central](https://img.shields.io/maven-central/v/com.io7m.dixmont/com.io7m.dixmont.svg?style=flat-square)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.io7m.dixmont%22)
 [![Maven Central (snapshot)](https://img.shields.io/nexus/s/com.io7m.dixmont/com.io7m.dixmont?server=https%3A%2F%2Fs01.oss.sonatype.org&style=flat-square)](https://s01.oss.sonatype.org/content/repositories/snapshots/com/io7m/dixmont/)
-[![Codecov](https://img.shields.io/codecov/c/github/io7m/dixmont.svg?style=flat-square)](https://codecov.io/gh/io7m/dixmont)
+[![Codecov](https://img.shields.io/codecov/c/github/io7m-com/dixmont.svg?style=flat-square)](https://codecov.io/gh/io7m-com/dixmont)
 
 ![com.io7m.dixmont](./src/site/resources/dixmont.jpg?raw=true)
 
 | JVM | Platform | Status |
 |-----|----------|--------|
-| OpenJDK (Temurin) Current | Linux | [![Build (OpenJDK (Temurin) Current, Linux)](https://img.shields.io/github/actions/workflow/status/io7m/dixmont/main.linux.temurin.current.yml)](https://github.com/io7m/dixmont/actions?query=workflow%3Amain.linux.temurin.current)|
-| OpenJDK (Temurin) LTS | Linux | [![Build (OpenJDK (Temurin) LTS, Linux)](https://img.shields.io/github/actions/workflow/status/io7m/dixmont/main.linux.temurin.lts.yml)](https://github.com/io7m/dixmont/actions?query=workflow%3Amain.linux.temurin.lts)|
-| OpenJDK (Temurin) Current | Windows | [![Build (OpenJDK (Temurin) Current, Windows)](https://img.shields.io/github/actions/workflow/status/io7m/dixmont/main.windows.temurin.current.yml)](https://github.com/io7m/dixmont/actions?query=workflow%3Amain.windows.temurin.current)|
-| OpenJDK (Temurin) LTS | Windows | [![Build (OpenJDK (Temurin) LTS, Windows)](https://img.shields.io/github/actions/workflow/status/io7m/dixmont/main.windows.temurin.lts.yml)](https://github.com/io7m/dixmont/actions?query=workflow%3Amain.windows.temurin.lts)|
+| OpenJDK (Temurin) Current | Linux | [![Build (OpenJDK (Temurin) Current, Linux)](https://img.shields.io/github/actions/workflow/status/io7m-com/dixmont/main.linux.temurin.current.yml)](https://www.github.com/io7m-com/dixmont/actions?query=workflow%3Amain.linux.temurin.current)|
+| OpenJDK (Temurin) LTS | Linux | [![Build (OpenJDK (Temurin) LTS, Linux)](https://img.shields.io/github/actions/workflow/status/io7m-com/dixmont/main.linux.temurin.lts.yml)](https://www.github.com/io7m-com/dixmont/actions?query=workflow%3Amain.linux.temurin.lts)|
+| OpenJDK (Temurin) Current | Windows | [![Build (OpenJDK (Temurin) Current, Windows)](https://img.shields.io/github/actions/workflow/status/io7m-com/dixmont/main.windows.temurin.current.yml)](https://www.github.com/io7m-com/dixmont/actions?query=workflow%3Amain.windows.temurin.current)|
+| OpenJDK (Temurin) LTS | Windows | [![Build (OpenJDK (Temurin) LTS, Windows)](https://img.shields.io/github/actions/workflow/status/io7m-com/dixmont/main.windows.temurin.lts.yml)](https://www.github.com/io7m-com/dixmont/actions?query=workflow%3Amain.windows.temurin.lts)|
 
 ## dixmont
 
@@ -21,7 +21,7 @@ Some useful extension classes for [jackson](https://github.com/FasterXML/jackson
 ### Features
 
   * Restricted JSON deserializer for preventing reflection-based serialization attacks.
-  * Written in pure Java 17.
+  * Written in pure Java 21.
   * [OSGi](https://www.osgi.org/) ready.
   * [JPMS](https://en.wikipedia.org/wiki/Java_Platform_Module_System) ready.
   * ISC license.
diff --git a/com.io7m.dixmont.colors/pom.xml b/com.io7m.dixmont.colors/pom.xml
index 672aad6..b475270 100644
--- a/com.io7m.dixmont.colors/pom.xml
+++ b/com.io7m.dixmont.colors/pom.xml
@@ -9,14 +9,14 @@
   <parent>
     <artifactId>com.io7m.dixmont</artifactId>
     <groupId>com.io7m.dixmont</groupId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>com.io7m.dixmont.colors</artifactId>
 
   <packaging>jar</packaging>
   <name>com.io7m.dixmont.colors</name>
   <description>Dixmont Jackson extensions (Colors)</description>
-  <url>https://www.github.com/io7m/dixmont</url>
+  <url>https://www.io7m.com/software/dixmont</url>
 
   <dependencies>
     <dependency>
diff --git a/com.io7m.dixmont.core/pom.xml b/com.io7m.dixmont.core/pom.xml
index 85db4cb..9f769f5 100644
--- a/com.io7m.dixmont.core/pom.xml
+++ b/com.io7m.dixmont.core/pom.xml
@@ -9,14 +9,14 @@
   <parent>
     <artifactId>com.io7m.dixmont</artifactId>
     <groupId>com.io7m.dixmont</groupId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>com.io7m.dixmont.core</artifactId>
 
   <packaging>jar</packaging>
   <name>com.io7m.dixmont.core</name>
   <description>Dixmont Jackson extensions (Core)</description>
-  <url>https://www.github.com/io7m/dixmont</url>
+  <url>https://www.io7m.com/software/dixmont</url>
 
   <dependencies>
     <dependency>
diff --git a/com.io7m.dixmont.tests/pom.xml b/com.io7m.dixmont.tests/pom.xml
index 8bbee44..cbb9435 100644
--- a/com.io7m.dixmont.tests/pom.xml
+++ b/com.io7m.dixmont.tests/pom.xml
@@ -9,17 +9,18 @@
   <parent>
     <artifactId>com.io7m.dixmont</artifactId>
     <groupId>com.io7m.dixmont</groupId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>com.io7m.dixmont.tests</artifactId>
 
   <packaging>jar</packaging>
   <name>com.io7m.dixmont.tests</name>
   <description>Dixmont Jackson extensions (Test suite)</description>
-  <url>https://www.github.com/io7m/dixmont</url>
+  <url>https://www.io7m.com/software/dixmont</url>
 
   <properties>
     <mdep.analyze.skip>true</mdep.analyze.skip>
+    <checkstyle.skip>true</checkstyle.skip>
   </properties>
 
   <dependencies>
diff --git a/com.io7m.dixmont.tests/src/test/java/com/io7m/dixmont/tests/DmColorSerializationTest.java b/com.io7m.dixmont.tests/src/main/java/com/io7m/dixmont/tests/DmColorSerializationTest.java
similarity index 100%
rename from com.io7m.dixmont.tests/src/test/java/com/io7m/dixmont/tests/DmColorSerializationTest.java
rename to com.io7m.dixmont.tests/src/main/java/com/io7m/dixmont/tests/DmColorSerializationTest.java
diff --git a/com.io7m.dixmont.tests/src/test/java/com/io7m/dixmont/tests/DmJsonRestrictedDeserializersTest.java b/com.io7m.dixmont.tests/src/main/java/com/io7m/dixmont/tests/DmJsonRestrictedDeserializersTest.java
similarity index 100%
rename from com.io7m.dixmont.tests/src/test/java/com/io7m/dixmont/tests/DmJsonRestrictedDeserializersTest.java
rename to com.io7m.dixmont.tests/src/main/java/com/io7m/dixmont/tests/DmJsonRestrictedDeserializersTest.java
diff --git a/com.io7m.dixmont.tests/src/main/java/com/io7m/dixmont/tests/Empty.java b/com.io7m.dixmont.tests/src/main/java/com/io7m/dixmont/tests/Empty.java
deleted file mode 100644
index 91e600e..0000000
--- a/com.io7m.dixmont.tests/src/main/java/com/io7m/dixmont/tests/Empty.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright © 2022 Mark Raynsford <code@io7m.com> https://www.io7m.com
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
- * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-package com.io7m.dixmont.tests;
-
-/**
- * Empty marker class for module descriptor.
- */
-
-public final class Empty
-{
-  private Empty()
-  {
-
-  }
-}
diff --git a/com.io7m.dixmont.tests/src/test/java/com/io7m/dixmont/tests/EnumExample.java b/com.io7m.dixmont.tests/src/main/java/com/io7m/dixmont/tests/EnumExample.java
similarity index 100%
rename from com.io7m.dixmont.tests/src/test/java/com/io7m/dixmont/tests/EnumExample.java
rename to com.io7m.dixmont.tests/src/main/java/com/io7m/dixmont/tests/EnumExample.java
diff --git a/com.io7m.dixmont.tests/src/main/java/com/io7m/dixmont/tests/package-info.java b/com.io7m.dixmont.tests/src/main/java/com/io7m/dixmont/tests/package-info.java
deleted file mode 100644
index 23fb41f..0000000
--- a/com.io7m.dixmont.tests/src/main/java/com/io7m/dixmont/tests/package-info.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright © 2021 Mark Raynsford <code@io7m.com> https://www.io7m.com
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
- * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/**
- * Dixmont Jackson extensions (Test suite)
- */
-
-@Export
-@Version("1.0.0")
-package com.io7m.dixmont.tests;
-
-import org.osgi.annotation.bundle.Export;
-import org.osgi.annotation.versioning.Version;
diff --git a/com.io7m.dixmont.tests/src/main/java/module-info.java b/com.io7m.dixmont.tests/src/main/java/module-info.java
deleted file mode 100644
index a9a0027..0000000
--- a/com.io7m.dixmont.tests/src/main/java/module-info.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright © 2022 Mark Raynsford <code@io7m.com> https://www.io7m.com
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
- * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/**
- * Dixmont Jackson extensions (Test suite)
- */
-
-module com.io7m.dixmont.tests
-{
-  requires static org.osgi.annotation.versioning;
-  requires static org.osgi.annotation.bundle;
-
-  requires com.fasterxml.jackson.annotation;
-  requires com.fasterxml.jackson.databind;
-  requires com.io7m.dixmont.colors;
-  requires org.junit.jupiter.api;
-  requires com.io7m.dixmont.core;
-
-  exports com.io7m.dixmont.tests;
-
-  opens com.io7m.dixmont.tests
-    to com.fasterxml.jackson.databind;
-}
diff --git a/com.io7m.dixmont.tests/src/test/resources/logback.xml b/com.io7m.dixmont.tests/src/main/resources/logback.xml
similarity index 100%
rename from com.io7m.dixmont.tests/src/test/resources/logback.xml
rename to com.io7m.dixmont.tests/src/main/resources/logback.xml
diff --git a/pom.xml b/pom.xml
index 9392356..590948d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,12 +13,12 @@
 
   <groupId>com.io7m.dixmont</groupId>
   <artifactId>com.io7m.dixmont</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
 
   <packaging>pom</packaging>
   <name>com.io7m.dixmont</name>
   <description>Dixmont Jackson extensions</description>
-  <url>https://www.github.com/io7m/dixmont</url>
+  <url>https://www.io7m.com/software/dixmont</url>
 
   <modules>
     <module>com.io7m.dixmont.colors</module>
@@ -27,8 +27,11 @@
   </modules>
 
   <properties>
+    <!-- Configuration -->
     <io7m.api.previousVersion>1.0.0</io7m.api.previousVersion>
     <io7m.java.targetJavaVersion>21</io7m.java.targetJavaVersion>
+
+    <!-- Third-party dependencies. -->
     <jackson.version>2.17.0</jackson.version>
     <junit.version>5.10.2</junit.version>
   </properties>
@@ -41,9 +44,9 @@
   </licenses>
 
   <scm>
-    <url>https://github.com/io7m/dixmont</url>
-    <connection>scm:git:https://github.com/io7m/dixmont</connection>
-    <developerConnection>scm:git:https://github.com/io7m/dixmont</developerConnection>
+    <url>https://www.github.com/io7m-com/dixmont</url>
+    <connection>scm:git:https://www.github.com/io7m-com/dixmont</connection>
+    <developerConnection>scm:git:https://www.github.com/io7m-com/dixmont</developerConnection>
   </scm>
 
   <developers>
@@ -56,7 +59,7 @@
   </developers>
 
   <issueManagement>
-    <url>https://www.github.com/io7m/dixmont/issues</url>
+    <url>https://www.github.com/io7m-com/dixmont/issues</url>
     <system>GitHub Issues</system>
   </issueManagement>
 
@@ -78,7 +81,7 @@
 
   <ciManagement>
     <system>GitHub Actions</system>
-    <url>https://github.com/dixmont/actions</url>
+    <url>https://www.github.com/io7m-com/dixmont/actions</url>
   </ciManagement>
 
   <prerequisites>
diff --git a/src/site/resources/overview.xml b/src/site/resources/overview.xml
index 330f6aa..cbf4fb2 100644
--- a/src/site/resources/overview.xml
+++ b/src/site/resources/overview.xml
@@ -1,15 +1,15 @@
 <div xmlns="http://www.w3.org/1999/xhtml">
   <p class="shields">
-    <a href="https://github.com/io7m/dixmont/actions?query=workflow%3Amain.linux.temurin.lts">
-      <img src="https://img.shields.io/github/actions/workflow/status/io7m/dixmont/main.linux.temurin.lts.yml"
+    <a href="https://www.github.com/io7m-com/dixmont/actions?query=workflow%3Amain.linux.temurin.lts">
+      <img src="https://img.shields.io/github/actions/workflow/status/io7m-com/dixmont/main.linux.temurin.lts.yml"
            alt="Build status"/>
     </a>
     <a href="http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.io7m.dixmont%22">
       <img src="https://img.shields.io/maven-central/v/com.io7m.dixmont/com.io7m.dixmont.svg?style=flat-square"
            alt="Maven Central"/>
     </a>
-    <a href="https://codecov.io/gh/io7m/dixmont">
-      <img src="https://img.shields.io/codecov/c/github/io7m/dixmont.svg?style=flat-square"
+    <a href="https://codecov.io/gh/io7m-com/dixmont">
+      <img src="https://img.shields.io/codecov/c/github/io7m-com/dixmont.svg?style=flat-square"
            alt="Codecov"/>
     </a>
   </p>