diff --git a/pom.xml b/pom.xml
index b652d06..02d5a31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,26 +12,43 @@
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
-        <nuts.version>5.1.0-rc.1</nuts.version>
+        <nuts.version>5.1.0</nuts.version>
         <openapi.spec.baseurl>https://raw.githubusercontent.com/nuts-foundation/nuts-node/v${nuts.version}/docs/_static</openapi.spec.baseurl>
         <openapi.spec.dir>${project.build.outputDirectory}/spec</openapi.spec.dir>
         <!-- OpenAPI Generator properties -->
-        <openapi.generator.maven.plugin.output>${project.basedir}/generated</openapi.generator.maven.plugin.output>
+        <openapi.generator.maven.plugin.output>${project.basedir}/</openapi.generator.maven.plugin.output>
         <openapi.generator.maven.plugin.artifactVersion>1.0-SNAPSHOT</openapi.generator.maven.plugin.artifactVersion>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>nl.reinkrul.nuts</groupId>
-            <artifactId>java-client</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
             <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
+
+        <!--  -->
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.6.9</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.10.1</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -41,7 +58,7 @@
                 <configuration>
                     <filesets>
                         <fileset>
-                            <directory>generated</directory>
+                            <directory>src/generated</directory>
                         </fileset>
                     </filesets>
                 </configuration>
@@ -103,12 +120,18 @@
                 <version>6.2.1</version>
                 <configuration>
                     <generatorName>java</generatorName>
+                    <generateSupportingFiles>true</generateSupportingFiles>
+                    <generateModelTests>false</generateModelTests>
+                    <generateModelDocumentation>false</generateModelDocumentation>
+                    <generateApiTests>false</generateApiTests>
+                    <generateApiDocumentation>false</generateApiDocumentation>
                     <configOptions>
-                        <sourceFolder>src/main/java</sourceFolder>
+                        <sourceFolder>src/generated/java</sourceFolder>
                         <groupId>nl.reinkrul.nuts</groupId>
                         <artifactId>java-client</artifactId>
                         <!-- SCM -->
-                        <scmDeveloperConnection>https://github.com/reinkrul/java-nuts-client.git</scmDeveloperConnection>
+                        <scmDeveloperConnection>https://github.com/reinkrul/java-nuts-client.git
+                        </scmDeveloperConnection>
                         <scmConnection>https://github.com/reinkrul/java-nuts-client.git</scmConnection>
                         <scmUrl>https://github.com/reinkrul/java-nuts-client</scmUrl>
                         <!-- Developer -->
@@ -252,26 +275,23 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>com.google.code.maven-replacer-plugin</groupId>
-                <artifactId>replacer</artifactId>
-                <version>1.5.3</version>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.2.0</version>
                 <executions>
                     <execution>
+                        <id>add-source</id>
                         <phase>generate-sources</phase>
                         <goals>
-                            <goal>replace</goal>
+                            <goal>add-source</goal>
                         </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/generated/java</source>
+                            </sources>
+                        </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <file>generated/pom.xml</file>
-                    <replacements>
-                        <replacement>
-                            <token>https://github.com/openapitools/openapi-generator</token>
-                            <value>https://github.com/reinkrul/java-nuts-client</value>
-                        </replacement>
-                    </replacements>
-                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/test/java/nl/reinkrul/nuts/ApiClientTest.java b/src/test/java/nl/reinkrul/nuts/ApiClientTest.java
deleted file mode 100644
index e2ec634..0000000
--- a/src/test/java/nl/reinkrul/nuts/ApiClientTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package nl.reinkrul.nuts;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpServer;
-import nl.reinkrul.nuts.common.DIDDocument;
-import nl.reinkrul.nuts.vdr.DIDCreateRequest;
-import nl.reinkrul.nuts.vdr.DidApi;
-import org.junit.jupiter.api.*;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.ServerSocket;
-
-public class ApiClientTest {
-
-    private static final String PATH = "/internal/vdr/v1/did";
-    private static final String BEARER_TOKEN = "some-token";
-    private static HttpServer server;
-
-    @BeforeAll
-    static void startServer() throws IOException {
-        server = HttpServer.create(new InetSocketAddress("localhost", freePort()), 0);
-        server.start();
-    }
-
-    @AfterAll
-    static void stopServer() {
-        server.stop(5);
-    }
-
-    @AfterEach
-    void unregisterContext() {
-        server.removeContext(PATH);
-    }
-
-    @Test
-    public void noAuthTest() throws ApiException {
-        server.createContext(PATH, ApiClientTest::sendOKResponse);
-
-        ApiClient apiClient = new ApiClient();
-        apiClient.setBasePath("http://" + server.getAddress().toString());
-
-        var didApi = new DidApi(apiClient);
-        didApi.createDID(new DIDCreateRequest());
-    }
-
-    @Test
-    public void bearerAuthTest() throws ApiException {
-        server.createContext(PATH, exchange -> {
-            var header = exchange.getRequestHeaders().get("Authorization").get(0);
-            if (header.equals("Bearer " + BEARER_TOKEN)) {
-                sendOKResponse(exchange);
-            } else {
-                // Fails test
-                exchange.sendResponseHeaders(401, 0);
-                exchange.close();
-            }
-        });
-
-        ApiClient apiClient = new ApiClient();
-        apiClient.setBearerToken(BEARER_TOKEN);
-        apiClient.setBasePath("http://" + server.getAddress().toString());
-
-        var didApi = new DidApi(apiClient);
-        didApi.createDID(new DIDCreateRequest());
-    }
-
-    private static void sendOKResponse(HttpExchange exchange) throws IOException {
-        exchange.sendResponseHeaders(200, 0);
-        exchange.getResponseHeaders().add("Content-Type", "application/json");
-        exchange.getResponseBody().write(new ObjectMapper().writeValueAsBytes(new DIDDocument()));
-        exchange.close();
-    }
-
-    private static int freePort() {
-        try (ServerSocket s = new ServerSocket(0)) {
-            return s.getLocalPort();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}