diff --git a/README.md b/README.md
index b96ad7a..7917dc2 100644
--- a/README.md
+++ b/README.md
@@ -192,8 +192,8 @@ To run the example service:
 
 ```bash
 java -jar \
-  dropwizard-jaxws-example/target/dropwizard-jakarta-xml-ws-example-[version].jar \
-  server dropwizard-jaxws-example/config.yaml
+  dropwizard-jakarta-xml-ws-example/target/dropwizard-jakarta-xml-ws-example-[version].jar \
+  server dropwizard-jakarta-xml-ws-example/config.yaml
 ```
 
 Notes
diff --git a/dropwizard-jakarta-xml-ws-example/pom.xml b/dropwizard-jakarta-xml-ws-example/pom.xml
index c94c67d..23c16fa 100644
--- a/dropwizard-jakarta-xml-ws-example/pom.xml
+++ b/dropwizard-jakarta-xml-ws-example/pom.xml
@@ -130,7 +130,7 @@
                                         <transformers>
                                             <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
                                             <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                                <mainClass>com.roskart.dropwizard.jaxws.example.JaxWsExampleApplication</mainClass>
+                                                <mainClass>org.kiwiproject.dropwizard.jakarta.xml.ws.example.JaxWsExampleApplication</mainClass>
                                             </transformer>
                                             <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                                 <resource>META-INF/cxf/bus-extensions.txt</resource>
diff --git a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/JaxWsExampleApplication.java b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/JaxWsExampleApplication.java
similarity index 78%
rename from dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/JaxWsExampleApplication.java
rename to dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/JaxWsExampleApplication.java
index 775fe85..34c5c4e 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/JaxWsExampleApplication.java
+++ b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/JaxWsExampleApplication.java
@@ -1,22 +1,5 @@
-package com.roskart.dropwizard.jaxws.example;
-
-import com.roskart.dropwizard.jaxws.BasicAuthentication;
-import com.roskart.dropwizard.jaxws.ClientBuilder;
-import com.roskart.dropwizard.jaxws.EndpointBuilder;
-import com.roskart.dropwizard.jaxws.JAXWSBundle;
-import com.roskart.dropwizard.jaxws.example.auth.BasicAuthenticator;
-import com.roskart.dropwizard.jaxws.example.core.Person;
-import com.roskart.dropwizard.jaxws.example.db.PersonDAO;
-import com.roskart.dropwizard.jaxws.example.resources.AccessMtomServiceResource;
-import com.roskart.dropwizard.jaxws.example.resources.AccessProtectedServiceResource;
-import com.roskart.dropwizard.jaxws.example.resources.AccessWsdlFirstServiceResource;
-import com.roskart.dropwizard.jaxws.example.resources.WsdlFirstClientHandler;
-import com.roskart.dropwizard.jaxws.example.ws.HibernateExampleService;
-import com.roskart.dropwizard.jaxws.example.ws.JavaFirstService;
-import com.roskart.dropwizard.jaxws.example.ws.JavaFirstServiceImpl;
-import com.roskart.dropwizard.jaxws.example.ws.MtomServiceImpl;
-import com.roskart.dropwizard.jaxws.example.ws.SimpleService;
-import com.roskart.dropwizard.jaxws.example.ws.WsdlFirstServiceImpl;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.example;
+
 import io.dropwizard.core.Application;
 import io.dropwizard.core.setup.Bootstrap;
 import io.dropwizard.core.setup.Environment;
@@ -25,10 +8,27 @@
 import org.apache.cxf.ext.logging.LoggingInInterceptor;
 import org.apache.cxf.ext.logging.LoggingOutInterceptor;
 import org.apache.cxf.jaxws.EndpointImpl;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.BasicAuthentication;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.ClientBuilder;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.EndpointBuilder;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.JAXWSBundle;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.example.auth.BasicAuthenticator;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.example.core.Person;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.example.db.PersonDAO;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.example.resources.AccessMtomServiceResource;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.example.resources.AccessProtectedServiceResource;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.example.resources.AccessWsdlFirstServiceResource;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.example.resources.WsdlFirstClientHandler;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws.HibernateExampleService;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws.JavaFirstService;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws.JavaFirstServiceImpl;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws.MtomServiceImpl;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws.SimpleService;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws.WsdlFirstServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import ws.example.jaxws.dropwizard.roskart.com.mtomservice.MtomService;
-import ws.example.jaxws.dropwizard.roskart.com.wsdlfirstservice.WsdlFirstService;
+import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.mtomservice.MtomService;
+import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.wsdlfirstservice.WsdlFirstService;
 
 public class JaxWsExampleApplication extends Application<JaxWsExampleApplicationConfiguration> {
 
diff --git a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/JaxWsExampleApplicationConfiguration.java b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/JaxWsExampleApplicationConfiguration.java
similarity index 89%
rename from dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/JaxWsExampleApplicationConfiguration.java
rename to dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/JaxWsExampleApplicationConfiguration.java
index 5eddd25..333d658 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/JaxWsExampleApplicationConfiguration.java
+++ b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/JaxWsExampleApplicationConfiguration.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws.example;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.example;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.dropwizard.core.Configuration;
diff --git a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/auth/BasicAuthenticator.java b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/auth/BasicAuthenticator.java
similarity index 83%
rename from dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/auth/BasicAuthenticator.java
rename to dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/auth/BasicAuthenticator.java
index b30e430..ebcd028 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/auth/BasicAuthenticator.java
+++ b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/auth/BasicAuthenticator.java
@@ -1,8 +1,8 @@
-package com.roskart.dropwizard.jaxws.example.auth;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.example.auth;
 
-import com.roskart.dropwizard.jaxws.example.core.User;
 import io.dropwizard.auth.Authenticator;
 import io.dropwizard.auth.basic.BasicCredentials;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.example.core.User;
 
 import java.util.Optional;
 
diff --git a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/core/Person.java b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/core/Person.java
similarity index 84%
rename from dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/core/Person.java
rename to dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/core/Person.java
index 75e3e07..1680d79 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/core/Person.java
+++ b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/core/Person.java
@@ -1,7 +1,7 @@
 /**
  * This class is copied from dropwizard-example
  */
-package com.roskart.dropwizard.jaxws.example.core;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.example.core;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -18,11 +18,11 @@
 @Entity
 @Table(name = "people")
 @NamedQuery(
-        name = "com.roskart.dropwizard.jaxws.example.core.Person.findAll",
+        name = "org.kiwiproject.dropwizard.jakarta.xml.ws.example.core.Person.findAll",
         query = "SELECT p FROM Person p"
 )
 @NamedQuery(
-        name = "com.roskart.dropwizard.jaxws.example.core.Person.findById",
+        name = "org.kiwiproject.dropwizard.jakarta.xml.ws.example.core.Person.findById",
         query = "SELECT p FROM Person p WHERE p.id = :id"
 )
 public class Person {
diff --git a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/auth/User.java b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/core/User.java
similarity index 84%
rename from dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/auth/User.java
rename to dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/core/User.java
index 5761076..40dfa84 100644
--- a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/auth/User.java
+++ b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/core/User.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws.auth;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.example.core;
 
 import java.security.Principal;
 
diff --git a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/db/PersonDAO.java b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/db/PersonDAO.java
similarity index 83%
rename from dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/db/PersonDAO.java
rename to dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/db/PersonDAO.java
index 0d1b0a5..8b66c41 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/db/PersonDAO.java
+++ b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/db/PersonDAO.java
@@ -1,10 +1,10 @@
-package com.roskart.dropwizard.jaxws.example.db;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.example.db;
 
-import com.roskart.dropwizard.jaxws.example.core.Person;
 import io.dropwizard.hibernate.AbstractDAO;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.query.Query;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.example.core.Person;
 
 import java.util.List;
 import java.util.Optional;
@@ -42,7 +42,7 @@ public Person create(Person person) {
     public List<Person> findAll() {
         @SuppressWarnings("unchecked")
         Query<Person> query =
-                (Query<Person>) namedQuery("com.roskart.dropwizard.jaxws.example.core.Person.findAll");
+                (Query<Person>) namedQuery("org.kiwiproject.dropwizard.jakarta.xml.ws.example.core.Person.findAll");
         return list(query);
     }
 }
diff --git a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/resources/AccessMtomServiceResource.java b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/resources/AccessMtomServiceResource.java
similarity index 74%
rename from dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/resources/AccessMtomServiceResource.java
rename to dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/resources/AccessMtomServiceResource.java
index b8ba53b..fcc27d9 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/resources/AccessMtomServiceResource.java
+++ b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/resources/AccessMtomServiceResource.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws.example.resources;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.example.resources;
 
 import com.codahale.metrics.annotation.Timed;
 import jakarta.activation.DataHandler;
@@ -8,10 +8,10 @@
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 import org.apache.cxf.helpers.IOUtils;
-import ws.example.jaxws.dropwizard.roskart.com.mtomservice.Hello;
-import ws.example.jaxws.dropwizard.roskart.com.mtomservice.HelloResponse;
-import ws.example.jaxws.dropwizard.roskart.com.mtomservice.MtomService;
-import ws.example.jaxws.dropwizard.roskart.com.mtomservice.ObjectFactory;
+import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.mtomservice.Hello;
+import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.mtomservice.HelloResponse;
+import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.mtomservice.MtomService;
+import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.mtomservice.ObjectFactory;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/resources/AccessProtectedServiceResource.java b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/resources/AccessProtectedServiceResource.java
similarity index 88%
rename from dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/resources/AccessProtectedServiceResource.java
rename to dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/resources/AccessProtectedServiceResource.java
index b5f345e..2c0699f 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/resources/AccessProtectedServiceResource.java
+++ b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/resources/AccessProtectedServiceResource.java
@@ -1,12 +1,12 @@
-package com.roskart.dropwizard.jaxws.example.resources;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.example.resources;
 
-import com.roskart.dropwizard.jaxws.example.ws.JavaFirstService;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.WebApplicationException;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.xml.ws.BindingProvider;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws.JavaFirstService;
 
 /**
  * A Dropwizard resource that invokes JavaFirstService SOAP web service using basic authentication.
diff --git a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/resources/AccessWsdlFirstServiceResource.java b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/resources/AccessWsdlFirstServiceResource.java
similarity index 67%
rename from dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/resources/AccessWsdlFirstServiceResource.java
rename to dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/resources/AccessWsdlFirstServiceResource.java
index 5c5bbea..d75b528 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/resources/AccessWsdlFirstServiceResource.java
+++ b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/resources/AccessWsdlFirstServiceResource.java
@@ -1,14 +1,14 @@
-package com.roskart.dropwizard.jaxws.example.resources;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.example.resources;
 
 import com.codahale.metrics.annotation.Timed;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
-import ws.example.jaxws.dropwizard.roskart.com.wsdlfirstservice.Echo;
-import ws.example.jaxws.dropwizard.roskart.com.wsdlfirstservice.EchoResponse;
-import ws.example.jaxws.dropwizard.roskart.com.wsdlfirstservice.ObjectFactory;
-import ws.example.jaxws.dropwizard.roskart.com.wsdlfirstservice.WsdlFirstService;
+import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.wsdlfirstservice.Echo;
+import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.wsdlfirstservice.EchoResponse;
+import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.wsdlfirstservice.ObjectFactory;
+import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.wsdlfirstservice.WsdlFirstService;
 
 /**
  * A Dropwizard resource that invokes WsdlFirstService SOAP web service.
diff --git a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/resources/WsdlFirstClientHandler.java b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/resources/WsdlFirstClientHandler.java
similarity index 74%
rename from dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/resources/WsdlFirstClientHandler.java
rename to dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/resources/WsdlFirstClientHandler.java
index 67b8825..ba12214 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/resources/WsdlFirstClientHandler.java
+++ b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/resources/WsdlFirstClientHandler.java
@@ -1,6 +1,6 @@
-package com.roskart.dropwizard.jaxws.example.resources;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.example.resources;
 
-import com.roskart.dropwizard.jaxws.example.util.SimpleLoggingSoapHandler;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.example.util.SimpleLoggingSoapHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/util/SimpleLoggingSoapHandler.java b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/util/SimpleLoggingSoapHandler.java
similarity index 95%
rename from dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/util/SimpleLoggingSoapHandler.java
rename to dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/util/SimpleLoggingSoapHandler.java
index ef52d55..3df4b46 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/util/SimpleLoggingSoapHandler.java
+++ b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/util/SimpleLoggingSoapHandler.java
@@ -1,12 +1,12 @@
-package com.roskart.dropwizard.jaxws.example.util;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.example.util;
 
 import jakarta.xml.ws.handler.MessageContext;
 import jakarta.xml.ws.handler.soap.SOAPHandler;
 import jakarta.xml.ws.handler.soap.SOAPMessageContext;
 import org.slf4j.Logger;
 
-import java.util.Set;
 import javax.xml.namespace.QName;
+import java.util.Set;
 
 public abstract class SimpleLoggingSoapHandler implements SOAPHandler<SOAPMessageContext> {
 
diff --git a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/ws/HibernateExampleService.java b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/HibernateExampleService.java
similarity index 82%
rename from dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/ws/HibernateExampleService.java
rename to dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/HibernateExampleService.java
index 04144ff..b676a91 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/ws/HibernateExampleService.java
+++ b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/HibernateExampleService.java
@@ -1,11 +1,11 @@
-package com.roskart.dropwizard.jaxws.example.ws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws;
 
-import com.roskart.dropwizard.jaxws.example.core.Person;
-import com.roskart.dropwizard.jaxws.example.db.PersonDAO;
 import io.dropwizard.hibernate.UnitOfWork;
 import jakarta.jws.WebMethod;
 import jakarta.jws.WebService;
 import jakarta.validation.Valid;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.example.core.Person;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.example.db.PersonDAO;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/ws/JavaFirstService.java b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/JavaFirstService.java
similarity index 78%
rename from dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/ws/JavaFirstService.java
rename to dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/JavaFirstService.java
index 329417f..b5d95f5 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/ws/JavaFirstService.java
+++ b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/JavaFirstService.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws.example.ws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws;
 
 import jakarta.jws.WebMethod;
 import jakarta.jws.WebParam;
@@ -6,7 +6,7 @@
 import jakarta.jws.WebService;
 import jakarta.xml.ws.WebFault;
 
-@WebService(targetNamespace = "http://com.roskart.dropwizard.example/JavaFirstService")
+@WebService(targetNamespace = "http://org.kiwiproject.dropwizard.example/JavaFirstService")
 public interface JavaFirstService {
 
     @WebFault(name = "JavaFirstServiceException")
diff --git a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/ws/JavaFirstServiceImpl.java b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/JavaFirstServiceImpl.java
similarity index 77%
rename from dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/ws/JavaFirstServiceImpl.java
rename to dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/JavaFirstServiceImpl.java
index 4a26aeb..3e36bff 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/ws/JavaFirstServiceImpl.java
+++ b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/JavaFirstServiceImpl.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws.example.ws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws;
 
 import com.codahale.metrics.annotation.ExceptionMetered;
 import com.codahale.metrics.annotation.Metered;
@@ -11,8 +11,8 @@
 @WebService(name = "JavaFirstService",
         serviceName = "JavaFirstService",
         portName = "JavaFirstService",
-        targetNamespace = "http://com.roskart.dropwizard.example/JavaFirstService",
-        endpointInterface = "com.roskart.dropwizard.jaxws.example.ws.JavaFirstService")
+        targetNamespace = "http://org.kiwiproject.dropwizard.example/JavaFirstService",
+        endpointInterface = "org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws.JavaFirstService")
 public class JavaFirstServiceImpl implements JavaFirstService {
 
     @Resource
diff --git a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/ws/MtomServiceImpl.java b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/MtomServiceImpl.java
similarity index 67%
rename from dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/ws/MtomServiceImpl.java
rename to dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/MtomServiceImpl.java
index 5d74232..6478f17 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/ws/MtomServiceImpl.java
+++ b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/MtomServiceImpl.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws.example.ws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws;
 
 import com.codahale.metrics.annotation.Metered;
 import jakarta.activation.DataHandler;
@@ -6,16 +6,16 @@
 import jakarta.mail.util.ByteArrayDataSource;
 import jakarta.xml.ws.soap.MTOM;
 import org.apache.cxf.helpers.IOUtils;
-import ws.example.jaxws.dropwizard.roskart.com.mtomservice.Hello;
-import ws.example.jaxws.dropwizard.roskart.com.mtomservice.HelloResponse;
-import ws.example.jaxws.dropwizard.roskart.com.mtomservice.MtomService;
+import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.mtomservice.Hello;
+import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.mtomservice.HelloResponse;
+import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.mtomservice.MtomService;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
 
 @MTOM // @MTOM annotation is not necessary if you invoke enableMtom on EndpointBuilder
-@WebService(endpointInterface = "ws.example.jaxws.dropwizard.roskart.com.mtomservice.MtomService",
-        targetNamespace = "http://com.roskart.dropwizard.jaxws.example.ws/MtomService",
+@WebService(endpointInterface = "ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.mtomservice.MtomService",
+        targetNamespace = "http://org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws/MtomService",
         name = "MtomService",
         wsdlLocation = "META-INF/MtomService.wsdl")
 public class MtomServiceImpl implements MtomService {
diff --git a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/ws/SimpleService.java b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/SimpleService.java
similarity index 80%
rename from dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/ws/SimpleService.java
rename to dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/SimpleService.java
index c99a208..586cb2f 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/ws/SimpleService.java
+++ b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/SimpleService.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws.example.ws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws;
 
 import com.codahale.metrics.annotation.Metered;
 import jakarta.jws.WebMethod;
diff --git a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/ws/WsdlFirstServiceHandler.java b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/WsdlFirstServiceHandler.java
similarity index 78%
rename from dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/ws/WsdlFirstServiceHandler.java
rename to dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/WsdlFirstServiceHandler.java
index f2ac374..20ce48e 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/ws/WsdlFirstServiceHandler.java
+++ b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/WsdlFirstServiceHandler.java
@@ -1,6 +1,6 @@
-package com.roskart.dropwizard.jaxws.example.ws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws;
 
-import com.roskart.dropwizard.jaxws.example.util.SimpleLoggingSoapHandler;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.example.util.SimpleLoggingSoapHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/ws/WsdlFirstServiceImpl.java b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/WsdlFirstServiceImpl.java
similarity index 72%
rename from dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/ws/WsdlFirstServiceImpl.java
rename to dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/WsdlFirstServiceImpl.java
index fc4b7d1..49ed5ca 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/ws/WsdlFirstServiceImpl.java
+++ b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/WsdlFirstServiceImpl.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws.example.ws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws;
 
 import com.codahale.metrics.annotation.Metered;
 import jakarta.jws.HandlerChain;
@@ -6,15 +6,15 @@
 import jakarta.xml.ws.AsyncHandler;
 import org.apache.cxf.annotations.UseAsyncMethod;
 import org.apache.cxf.jaxws.ServerAsyncResponse;
-import ws.example.jaxws.dropwizard.roskart.com.wsdlfirstservice.Echo;
-import ws.example.jaxws.dropwizard.roskart.com.wsdlfirstservice.EchoResponse;
-import ws.example.jaxws.dropwizard.roskart.com.wsdlfirstservice.NonBlockingEcho;
-import ws.example.jaxws.dropwizard.roskart.com.wsdlfirstservice.WsdlFirstService;
+import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.wsdlfirstservice.Echo;
+import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.wsdlfirstservice.EchoResponse;
+import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.wsdlfirstservice.NonBlockingEcho;
+import ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.wsdlfirstservice.WsdlFirstService;
 
 import java.util.concurrent.Future;
 
-@WebService(endpointInterface = "ws.example.jaxws.dropwizard.roskart.com.wsdlfirstservice.WsdlFirstService",
-        targetNamespace = "http://com.roskart.dropwizard.jaxws.example.ws/WsdlFirstService",
+@WebService(endpointInterface = "ws.example.ws.xml.jakarta.dropwizard.kiwiproject.org.wsdlfirstservice.WsdlFirstService",
+        targetNamespace = "http://org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws/WsdlFirstService",
         name = "WsdlFirstService",
         wsdlLocation = "META-INF/WsdlFirstService.wsdl")
 @HandlerChain(file = "wsdlfirstservice-handlerchain.xml")
diff --git a/dropwizard-jakarta-xml-ws-example/src/main/resources/META-INF/MtomService.wsdl b/dropwizard-jakarta-xml-ws-example/src/main/resources/META-INF/MtomService.wsdl
index 4afa76b..a6f4211 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/resources/META-INF/MtomService.wsdl
+++ b/dropwizard-jakarta-xml-ws-example/src/main/resources/META-INF/MtomService.wsdl
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <wsdl:definitions
         xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:tns="http://com.roskart.dropwizard.jaxws.example.ws/MtomService"
+        xmlns:tns="http://org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws/MtomService"
         xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
         xmlns:xsd="http://www.w3.org/2001/XMLSchema"
         xmlns:xmime="http://www.w3.org/2005/05/xmlmime"
         name="MtomService"
-        targetNamespace="http://com.roskart.dropwizard.jaxws.example.ws/MtomService">
+        targetNamespace="http://org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws/MtomService">
 
     <wsdl:types>
-        <xsd:schema targetNamespace="http://com.roskart.dropwizard.jaxws.example.ws/MtomService">
+        <xsd:schema targetNamespace="http://org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws/MtomService">
 
             <xsd:element name="Hello" type="tns:Hello">
             </xsd:element>
diff --git a/dropwizard-jakarta-xml-ws-example/src/main/resources/META-INF/WsdlFirstService.wsdl b/dropwizard-jakarta-xml-ws-example/src/main/resources/META-INF/WsdlFirstService.wsdl
index eed1f97..ec7265f 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/resources/META-INF/WsdlFirstService.wsdl
+++ b/dropwizard-jakarta-xml-ws-example/src/main/resources/META-INF/WsdlFirstService.wsdl
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<wsdl:definitions 
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-	xmlns:tns="http://com.roskart.dropwizard.jaxws.example.ws/WsdlFirstService"
+<wsdl:definitions
+        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+        xmlns:tns="http://org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws/WsdlFirstService"
 	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
 	xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
 	name="WsdlFirstService"
-	targetNamespace="http://com.roskart.dropwizard.jaxws.example.ws/WsdlFirstService">
+        targetNamespace="http://org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws/WsdlFirstService">
 	
   <wsdl:types>
-    <xsd:schema targetNamespace="http://com.roskart.dropwizard.jaxws.example.ws/WsdlFirstService">
+      <xsd:schema targetNamespace="http://org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws/WsdlFirstService">
       
       <xsd:element name="Echo" type="tns:Echo">
       </xsd:element>
diff --git a/dropwizard-jakarta-xml-ws-example/src/main/resources/com/roskart/dropwizard/jaxws/example/ws/wsdlfirstservice-handlerchain.xml b/dropwizard-jakarta-xml-ws-example/src/main/resources/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/wsdlfirstservice-handlerchain.xml
similarity index 57%
rename from dropwizard-jakarta-xml-ws-example/src/main/resources/com/roskart/dropwizard/jaxws/example/ws/wsdlfirstservice-handlerchain.xml
rename to dropwizard-jakarta-xml-ws-example/src/main/resources/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/wsdlfirstservice-handlerchain.xml
index 76f4542..2b2ce2a 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/resources/com/roskart/dropwizard/jaxws/example/ws/wsdlfirstservice-handlerchain.xml
+++ b/dropwizard-jakarta-xml-ws-example/src/main/resources/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/wsdlfirstservice-handlerchain.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jws:handler-chains xmlns:jws="http://java.sun.com/xml/ns/javaee" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<jws:handler-chains xmlns:jws="http://java.sun.com/xml/ns/javaee">
     <jws:handler-chain>
         <jws:handler>
-            <jws:handler-class>com.roskart.dropwizard.jaxws.example.ws.WsdlFirstServiceHandler</jws:handler-class>
+            <jws:handler-class>org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws.WsdlFirstServiceHandler
+            </jws:handler-class>
         </jws:handler>
     </jws:handler-chain>
 </jws:handler-chains>
diff --git a/dropwizard-jakarta-xml-ws-example/src/test/java/com/roskart/dropwizard/jaxws/example/resources/WsdlFirstClientHandlerTest.java b/dropwizard-jakarta-xml-ws-example/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/resources/WsdlFirstClientHandlerTest.java
similarity index 89%
rename from dropwizard-jakarta-xml-ws-example/src/test/java/com/roskart/dropwizard/jaxws/example/resources/WsdlFirstClientHandlerTest.java
rename to dropwizard-jakarta-xml-ws-example/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/resources/WsdlFirstClientHandlerTest.java
index 8d90216..9470e14 100644
--- a/dropwizard-jakarta-xml-ws-example/src/test/java/com/roskart/dropwizard/jaxws/example/resources/WsdlFirstClientHandlerTest.java
+++ b/dropwizard-jakarta-xml-ws-example/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/resources/WsdlFirstClientHandlerTest.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws.example.resources;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.example.resources;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/dropwizard-jakarta-xml-ws-example/src/test/java/com/roskart/dropwizard/jaxws/example/util/SimpleLoggingSoapHandlerTest.java b/dropwizard-jakarta-xml-ws-example/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/util/SimpleLoggingSoapHandlerTest.java
similarity index 96%
rename from dropwizard-jakarta-xml-ws-example/src/test/java/com/roskart/dropwizard/jaxws/example/util/SimpleLoggingSoapHandlerTest.java
rename to dropwizard-jakarta-xml-ws-example/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/util/SimpleLoggingSoapHandlerTest.java
index a38554d..72f3883 100644
--- a/dropwizard-jakarta-xml-ws-example/src/test/java/com/roskart/dropwizard/jaxws/example/util/SimpleLoggingSoapHandlerTest.java
+++ b/dropwizard-jakarta-xml-ws-example/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/util/SimpleLoggingSoapHandlerTest.java
@@ -1,10 +1,12 @@
-package com.roskart.dropwizard.jaxws.example.util;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.example.util;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import jakarta.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.handler.soap.SOAPMessageContext;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -12,9 +14,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.xml.ws.handler.MessageContext;
-import jakarta.xml.ws.handler.soap.SOAPMessageContext;
-
 class SimpleLoggingSoapHandlerTest {
 
     private static final Logger LOG = LoggerFactory.getLogger(SimpleLoggingSoapHandlerTest.class);
diff --git a/dropwizard-jakarta-xml-ws-example/src/test/java/com/roskart/dropwizard/jaxws/example/ws/WsdlFirstServiceHandlerTest.java b/dropwizard-jakarta-xml-ws-example/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/WsdlFirstServiceHandlerTest.java
similarity index 90%
rename from dropwizard-jakarta-xml-ws-example/src/test/java/com/roskart/dropwizard/jaxws/example/ws/WsdlFirstServiceHandlerTest.java
rename to dropwizard-jakarta-xml-ws-example/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/WsdlFirstServiceHandlerTest.java
index c020014..e65806e 100644
--- a/dropwizard-jakarta-xml-ws-example/src/test/java/com/roskart/dropwizard/jaxws/example/ws/WsdlFirstServiceHandlerTest.java
+++ b/dropwizard-jakarta-xml-ws-example/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/WsdlFirstServiceHandlerTest.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws.example.ws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/AbstractBuilder.java b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/AbstractBuilder.java
similarity index 98%
rename from dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/AbstractBuilder.java
rename to dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/AbstractBuilder.java
index 2965026..b284438 100644
--- a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/AbstractBuilder.java
+++ b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/AbstractBuilder.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import com.google.common.collect.ImmutableList;
 import org.apache.cxf.interceptor.Interceptor;
diff --git a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/AbstractInvoker.java b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/AbstractInvoker.java
similarity index 96%
rename from dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/AbstractInvoker.java
rename to dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/AbstractInvoker.java
index d1af246..3598c6a 100644
--- a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/AbstractInvoker.java
+++ b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/AbstractInvoker.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.service.invoker.Invoker;
diff --git a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/BasicAuthentication.java b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/BasicAuthentication.java
similarity index 91%
rename from dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/BasicAuthentication.java
rename to dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/BasicAuthentication.java
index f3209b0..bd25683 100644
--- a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/BasicAuthentication.java
+++ b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/BasicAuthentication.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import io.dropwizard.auth.Authenticator;
 import io.dropwizard.auth.basic.BasicCredentials;
diff --git a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/BasicAuthenticationInterceptor.java b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/BasicAuthenticationInterceptor.java
similarity index 99%
rename from dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/BasicAuthenticationInterceptor.java
rename to dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/BasicAuthenticationInterceptor.java
index d1ef993..bf13418 100644
--- a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/BasicAuthenticationInterceptor.java
+++ b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/BasicAuthenticationInterceptor.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import io.dropwizard.auth.AuthenticationException;
 import io.dropwizard.auth.basic.BasicCredentials;
diff --git a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/ClientBuilder.java b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/ClientBuilder.java
similarity index 98%
rename from dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/ClientBuilder.java
rename to dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/ClientBuilder.java
index a15ff8e..addfc70 100644
--- a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/ClientBuilder.java
+++ b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/ClientBuilder.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
diff --git a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/EndpointBuilder.java b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/EndpointBuilder.java
similarity index 98%
rename from dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/EndpointBuilder.java
rename to dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/EndpointBuilder.java
index 1a646fb..c2771b2 100644
--- a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/EndpointBuilder.java
+++ b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/EndpointBuilder.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
diff --git a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/InstrumentedInvokerFactory.java b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/InstrumentedInvokerFactory.java
similarity index 98%
rename from dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/InstrumentedInvokerFactory.java
rename to dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/InstrumentedInvokerFactory.java
index 63c599b..49a9250 100644
--- a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/InstrumentedInvokerFactory.java
+++ b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/InstrumentedInvokerFactory.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;
@@ -16,7 +16,7 @@
 /**
  * Provides factory method for creating instrumented CXF invoker chain.
  *
- * @see com.roskart.dropwizard.jaxws.InstrumentedInvokers
+ * @see InstrumentedInvokers
  * @see com.codahale.metrics.jersey3.InstrumentedResourceMethodApplicationListener
  */
 public class InstrumentedInvokerFactory {
diff --git a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/InstrumentedInvokers.java b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/InstrumentedInvokers.java
similarity index 98%
rename from dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/InstrumentedInvokers.java
rename to dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/InstrumentedInvokers.java
index f23e88d..2e8c778 100644
--- a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/InstrumentedInvokers.java
+++ b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/InstrumentedInvokers.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.Timer;
diff --git a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/JAXWSBundle.java b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/JAXWSBundle.java
similarity index 98%
rename from dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/JAXWSBundle.java
rename to dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/JAXWSBundle.java
index 72cbe31..e4378a0 100644
--- a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/JAXWSBundle.java
+++ b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/JAXWSBundle.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
diff --git a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/JAXWSEnvironment.java b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/JAXWSEnvironment.java
similarity index 99%
rename from dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/JAXWSEnvironment.java
rename to dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/JAXWSEnvironment.java
index 9a06883..16e85be 100644
--- a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/JAXWSEnvironment.java
+++ b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/JAXWSEnvironment.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
diff --git a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/UnitOfWorkInvoker.java b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/UnitOfWorkInvoker.java
similarity index 98%
rename from dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/UnitOfWorkInvoker.java
rename to dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/UnitOfWorkInvoker.java
index 0e4f9e6..682cfdf 100644
--- a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/UnitOfWorkInvoker.java
+++ b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/UnitOfWorkInvoker.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import com.google.common.collect.ImmutableMap;
 import io.dropwizard.hibernate.UnitOfWork;
diff --git a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/UnitOfWorkInvokerFactory.java b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/UnitOfWorkInvokerFactory.java
similarity index 95%
rename from dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/UnitOfWorkInvokerFactory.java
rename to dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/UnitOfWorkInvokerFactory.java
index 79d85ce..d22c183 100644
--- a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/UnitOfWorkInvokerFactory.java
+++ b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/UnitOfWorkInvokerFactory.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import com.google.common.collect.ImmutableMap;
 import io.dropwizard.hibernate.UnitOfWork;
diff --git a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/ValidatingInvoker.java b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/ValidatingInvoker.java
similarity index 98%
rename from dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/ValidatingInvoker.java
rename to dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/ValidatingInvoker.java
index df9c594..880ac74 100644
--- a/dropwizard-jakarta-xml-ws/src/main/java/com/roskart/dropwizard/jaxws/ValidatingInvoker.java
+++ b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/ValidatingInvoker.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import io.dropwizard.validation.ConstraintViolations;
 import io.dropwizard.validation.Validated;
diff --git a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/BasicAuthenticationInterceptorTest.java b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/BasicAuthenticationInterceptorTest.java
similarity index 94%
rename from dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/BasicAuthenticationInterceptorTest.java
rename to dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/BasicAuthenticationInterceptorTest.java
index 096dc17..1602ca3 100644
--- a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/BasicAuthenticationInterceptorTest.java
+++ b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/BasicAuthenticationInterceptorTest.java
@@ -1,12 +1,11 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
-import static com.roskart.dropwizard.jaxws.BasicAuthenticationInterceptor.PRINCIPAL_KEY;
+import static org.kiwiproject.dropwizard.jakarta.xml.ws.BasicAuthenticationInterceptor.PRINCIPAL_KEY;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.roskart.dropwizard.jaxws.auth.BasicAuthenticator;
 import org.apache.cxf.configuration.security.AuthorizationPolicy;
 import org.apache.cxf.interceptor.InterceptorChain;
 import org.apache.cxf.message.Exchange;
@@ -17,6 +16,7 @@
 import org.apache.cxf.transport.Destination;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.kiwiproject.dropwizard.jakarta.xml.ws.auth.BasicAuthenticator;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
diff --git a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/ClientBuilderTest.java b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/ClientBuilderTest.java
similarity index 97%
rename from dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/ClientBuilderTest.java
rename to dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/ClientBuilderTest.java
index 96cf152..121caa0 100644
--- a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/ClientBuilderTest.java
+++ b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/ClientBuilderTest.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/DummyService.java b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/DummyService.java
similarity index 78%
rename from dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/DummyService.java
rename to dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/DummyService.java
index 49262b4..e658d68 100644
--- a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/DummyService.java
+++ b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/DummyService.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import jakarta.jws.WebMethod;
 import jakarta.jws.WebService;
diff --git a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/EndpointBuilderTest.java b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/EndpointBuilderTest.java
similarity index 97%
rename from dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/EndpointBuilderTest.java
rename to dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/EndpointBuilderTest.java
index a9ba8cc..257aed1 100644
--- a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/EndpointBuilderTest.java
+++ b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/EndpointBuilderTest.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
diff --git a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/InstrumentedInvokerFactoryTest.java b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/InstrumentedInvokerFactoryTest.java
similarity index 99%
rename from dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/InstrumentedInvokerFactoryTest.java
rename to dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/InstrumentedInvokerFactoryTest.java
index d3b051f..7ab5ecd 100644
--- a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/InstrumentedInvokerFactoryTest.java
+++ b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/InstrumentedInvokerFactoryTest.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatRuntimeException;
diff --git a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/JAXWSBundleTest.java b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/JAXWSBundleTest.java
similarity index 99%
rename from dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/JAXWSBundleTest.java
rename to dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/JAXWSBundleTest.java
index 32371a9..c57ce95 100644
--- a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/JAXWSBundleTest.java
+++ b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/JAXWSBundleTest.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
diff --git a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/JAXWSEnvironmentTest.java b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/JAXWSEnvironmentTest.java
similarity index 99%
rename from dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/JAXWSEnvironmentTest.java
rename to dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/JAXWSEnvironmentTest.java
index 1a80980..baf4b04 100644
--- a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/JAXWSEnvironmentTest.java
+++ b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/JAXWSEnvironmentTest.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -126,7 +126,7 @@ public void handleMessage(Message message) throws Fault {
 
         testutils.setBus(jaxwsEnvironment.bus);
         testutils.addNamespace("soap", "http://schemas.xmlsoap.org/soap/envelope/");
-        testutils.addNamespace("a", "http://jaxws.dropwizard.roskart.com/");
+        testutils.addNamespace("a", "http://ws.xml.jakarta.dropwizard.kiwiproject.org/");
     }
 
     @AfterEach
diff --git a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/UnitOfWorkInvokerFactoryTest.java b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/UnitOfWorkInvokerFactoryTest.java
similarity index 99%
rename from dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/UnitOfWorkInvokerFactoryTest.java
rename to dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/UnitOfWorkInvokerFactoryTest.java
index b4e144c..e7a08ad 100644
--- a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/UnitOfWorkInvokerFactoryTest.java
+++ b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/UnitOfWorkInvokerFactoryTest.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatRuntimeException;
diff --git a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/ValidatingInvokerTest.java b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/ValidatingInvokerTest.java
similarity index 99%
rename from dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/ValidatingInvokerTest.java
rename to dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/ValidatingInvokerTest.java
index b2c7236..92a8bf1 100644
--- a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/ValidatingInvokerTest.java
+++ b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/ValidatingInvokerTest.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws;
+package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
diff --git a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/auth/BasicAuthenticator.java b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/auth/BasicAuthenticator.java
similarity index 92%
rename from dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/auth/BasicAuthenticator.java
rename to dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/auth/BasicAuthenticator.java
index faccf83..841a333 100644
--- a/dropwizard-jakarta-xml-ws/src/test/java/com/roskart/dropwizard/jaxws/auth/BasicAuthenticator.java
+++ b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/auth/BasicAuthenticator.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws.auth;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.auth;
 
 import io.dropwizard.auth.Authenticator;
 import io.dropwizard.auth.basic.BasicCredentials;
diff --git a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/core/User.java b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/auth/User.java
similarity index 85%
rename from dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/core/User.java
rename to dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/auth/User.java
index 85a20dc..70415d9 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/java/com/roskart/dropwizard/jaxws/example/core/User.java
+++ b/dropwizard-jakarta-xml-ws/src/test/java/org/kiwiproject/dropwizard/jakarta/xml/ws/auth/User.java
@@ -1,4 +1,4 @@
-package com.roskart.dropwizard.jaxws.example.core;
+package org.kiwiproject.dropwizard.jakarta.xml.ws.auth;
 
 import java.security.Principal;
 
diff --git a/dropwizard-jakarta-xml-ws/src/test/resources/com/roskart/dropwizard/jaxws/test-soap-request.xml b/dropwizard-jakarta-xml-ws/src/test/resources/org/kiwiproject/dropwizard/jakarta/xml/ws/test-soap-request.xml
similarity index 62%
rename from dropwizard-jakarta-xml-ws/src/test/resources/com/roskart/dropwizard/jaxws/test-soap-request.xml
rename to dropwizard-jakarta-xml-ws/src/test/resources/org/kiwiproject/dropwizard/jakarta/xml/ws/test-soap-request.xml
index 7d5a796..765596f 100644
--- a/dropwizard-jakarta-xml-ws/src/test/resources/com/roskart/dropwizard/jaxws/test-soap-request.xml
+++ b/dropwizard-jakarta-xml-ws/src/test/resources/org/kiwiproject/dropwizard/jakarta/xml/ws/test-soap-request.xml
@@ -1,7 +1,7 @@
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
-                  xmlns:res="http://jaxws.dropwizard.roskart.com/">
+                  xmlns:res="http://ws.xml.jakarta.dropwizard.kiwiproject.org/">
     <soapenv:Header/>
     <soapenv:Body>
         <res:foo></res:foo>
     </soapenv:Body>
-</soapenv:Envelope>
\ No newline at end of file
+</soapenv:Envelope>