diff --git a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/JodaTimeTest.java b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/JodaTimeTest.java
similarity index 94%
rename from processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/JodaTimeTest.java
rename to processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/JodaTimeTest.java
index 791f02f8a..b518cb741 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/JodaTimeTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/JodaTimeTest.java
@@ -16,9 +16,8 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.builtin.bean.jodatime;
+package org.mapstruct.ap.test.builtin.jodatime;
 
-import java.util.TimeZone;
 import javax.xml.datatype.DatatypeConstants;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
@@ -30,19 +29,19 @@ import org.joda.time.LocalDateTime;
 import org.joda.time.LocalTime;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mapstruct.ap.test.builtin.bean.jodatime.bean.DateTimeBean;
-import org.mapstruct.ap.test.builtin.bean.jodatime.bean.LocalDateBean;
-import org.mapstruct.ap.test.builtin.bean.jodatime.bean.LocalDateTimeBean;
-import org.mapstruct.ap.test.builtin.bean.jodatime.bean.LocalTimeBean;
-import org.mapstruct.ap.test.builtin.bean.jodatime.bean.XmlGregorianCalendarBean;
-import org.mapstruct.ap.test.builtin.bean.jodatime.mapper.DateTimeToXmlGregorianCalendar;
-import org.mapstruct.ap.test.builtin.bean.jodatime.mapper.LocalDateTimeToXmlGregorianCalendar;
-import org.mapstruct.ap.test.builtin.bean.jodatime.mapper.LocalDateToXmlGregorianCalendar;
-import org.mapstruct.ap.test.builtin.bean.jodatime.mapper.LocalTimeToXmlGregorianCalendar;
-import org.mapstruct.ap.test.builtin.bean.jodatime.mapper.XmlGregorianCalendarToDateTime;
-import org.mapstruct.ap.test.builtin.bean.jodatime.mapper.XmlGregorianCalendarToLocalDate;
-import org.mapstruct.ap.test.builtin.bean.jodatime.mapper.XmlGregorianCalendarToLocalDateTime;
-import org.mapstruct.ap.test.builtin.bean.jodatime.mapper.XmlGregorianCalendarToLocalTime;
+import org.mapstruct.ap.test.builtin.jodatime.bean.DateTimeBean;
+import org.mapstruct.ap.test.builtin.jodatime.bean.LocalDateBean;
+import org.mapstruct.ap.test.builtin.jodatime.bean.LocalDateTimeBean;
+import org.mapstruct.ap.test.builtin.jodatime.bean.LocalTimeBean;
+import org.mapstruct.ap.test.builtin.jodatime.bean.XmlGregorianCalendarBean;
+import org.mapstruct.ap.test.builtin.jodatime.mapper.DateTimeToXmlGregorianCalendar;
+import org.mapstruct.ap.test.builtin.jodatime.mapper.LocalDateTimeToXmlGregorianCalendar;
+import org.mapstruct.ap.test.builtin.jodatime.mapper.LocalDateToXmlGregorianCalendar;
+import org.mapstruct.ap.test.builtin.jodatime.mapper.LocalTimeToXmlGregorianCalendar;
+import org.mapstruct.ap.test.builtin.jodatime.mapper.XmlGregorianCalendarToDateTime;
+import org.mapstruct.ap.test.builtin.jodatime.mapper.XmlGregorianCalendarToLocalDate;
+import org.mapstruct.ap.test.builtin.jodatime.mapper.XmlGregorianCalendarToLocalDateTime;
+import org.mapstruct.ap.test.builtin.jodatime.mapper.XmlGregorianCalendarToLocalTime;
 import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
@@ -140,7 +139,7 @@ public class JodaTimeTest {
         assertThat( res.getDateTime().getMinuteOfHour() ).isEqualTo( 34 );
         assertThat( res.getDateTime().getSecondOfMinute() ).isEqualTo( 45 );
         assertThat( res.getDateTime().getMillisOfSecond() ).isEqualTo( 500 );
-        assertThat( res.getDateTime().getZone().getID() ).isEqualTo( TimeZone.getDefault().getID() );
+        assertThat( res.getDateTime().getZone().getOffset( 0 ) ).isEqualTo( DateTimeZone.getDefault().getOffset( 0 ) );
     }
 
     @Test
@@ -191,7 +190,7 @@ public class JodaTimeTest {
         assertThat( res.getDateTime().getMinuteOfHour() ).isEqualTo( 34 );
         assertThat( res.getDateTime().getSecondOfMinute() ).isEqualTo( 45 );
         assertThat( res.getDateTime().getMillisOfSecond() ).isEqualTo( 0 );
-        assertThat( res.getDateTime().getZone().getID() ).isEqualTo( TimeZone.getDefault().getID() );
+        assertThat( res.getDateTime().getZone().getOffset( 0 ) ).isEqualTo( DateTimeZone.getDefault().getOffset( 0 ) );
     }
 
     @Test
@@ -240,7 +239,7 @@ public class JodaTimeTest {
         assertThat( res.getDateTime().getMinuteOfHour() ).isEqualTo( 34 );
         assertThat( res.getDateTime().getSecondOfMinute() ).isEqualTo( 0 );
         assertThat( res.getDateTime().getMillisOfSecond() ).isEqualTo( 0 );
-        assertThat( res.getDateTime().getZone().getID() ).isEqualTo( TimeZone.getDefault().getID() );
+        assertThat( res.getDateTime().getZone().getOffset( 0 ) ).isEqualTo( DateTimeZone.getDefault().getOffset( 0 ) );
     }
 
     @Test
diff --git a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/bean/DateTimeBean.java b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/bean/DateTimeBean.java
similarity index 94%
rename from processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/bean/DateTimeBean.java
rename to processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/bean/DateTimeBean.java
index 444b96774..cf13aac06 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/bean/DateTimeBean.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/bean/DateTimeBean.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.builtin.bean.jodatime.bean;
+package org.mapstruct.ap.test.builtin.jodatime.bean;
 
 import org.joda.time.DateTime;
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/bean/LocalDateBean.java b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/bean/LocalDateBean.java
similarity index 95%
rename from processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/bean/LocalDateBean.java
rename to processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/bean/LocalDateBean.java
index ddf4181cf..eb34e8915 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/bean/LocalDateBean.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/bean/LocalDateBean.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.builtin.bean.jodatime.bean;
+package org.mapstruct.ap.test.builtin.jodatime.bean;
 
 import org.joda.time.LocalDate;
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/bean/LocalDateTimeBean.java b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/bean/LocalDateTimeBean.java
similarity index 95%
rename from processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/bean/LocalDateTimeBean.java
rename to processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/bean/LocalDateTimeBean.java
index cf40b87ce..981b4ca54 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/bean/LocalDateTimeBean.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/bean/LocalDateTimeBean.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.builtin.bean.jodatime.bean;
+package org.mapstruct.ap.test.builtin.jodatime.bean;
 
 import org.joda.time.LocalDateTime;
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/bean/LocalTimeBean.java b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/bean/LocalTimeBean.java
similarity index 95%
rename from processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/bean/LocalTimeBean.java
rename to processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/bean/LocalTimeBean.java
index ea7f0c396..3bcaf16f7 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/bean/LocalTimeBean.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/bean/LocalTimeBean.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.builtin.bean.jodatime.bean;
+package org.mapstruct.ap.test.builtin.jodatime.bean;
 
 import org.joda.time.LocalTime;
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/bean/XmlGregorianCalendarBean.java b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/bean/XmlGregorianCalendarBean.java
similarity index 95%
rename from processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/bean/XmlGregorianCalendarBean.java
rename to processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/bean/XmlGregorianCalendarBean.java
index 3a8a7fd92..cf89c371a 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/bean/XmlGregorianCalendarBean.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/bean/XmlGregorianCalendarBean.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.builtin.bean.jodatime.bean;
+package org.mapstruct.ap.test.builtin.jodatime.bean;
 
 import javax.xml.datatype.XMLGregorianCalendar;
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/DateTimeToXmlGregorianCalendar.java b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/DateTimeToXmlGregorianCalendar.java
similarity index 85%
rename from processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/DateTimeToXmlGregorianCalendar.java
rename to processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/DateTimeToXmlGregorianCalendar.java
index f98640180..fb238c2f4 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/DateTimeToXmlGregorianCalendar.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/DateTimeToXmlGregorianCalendar.java
@@ -16,12 +16,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.builtin.bean.jodatime.mapper;
+package org.mapstruct.ap.test.builtin.jodatime.mapper;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.ap.test.builtin.bean.jodatime.bean.DateTimeBean;
-import org.mapstruct.ap.test.builtin.bean.jodatime.bean.XmlGregorianCalendarBean;
+import org.mapstruct.ap.test.builtin.jodatime.bean.DateTimeBean;
+import org.mapstruct.ap.test.builtin.jodatime.bean.XmlGregorianCalendarBean;
 import org.mapstruct.factory.Mappers;
 
 /**
diff --git a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/LocalDateTimeToXmlGregorianCalendar.java b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/LocalDateTimeToXmlGregorianCalendar.java
similarity index 85%
rename from processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/LocalDateTimeToXmlGregorianCalendar.java
rename to processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/LocalDateTimeToXmlGregorianCalendar.java
index 406135111..fe8d67c72 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/LocalDateTimeToXmlGregorianCalendar.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/LocalDateTimeToXmlGregorianCalendar.java
@@ -16,12 +16,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.builtin.bean.jodatime.mapper;
+package org.mapstruct.ap.test.builtin.jodatime.mapper;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.ap.test.builtin.bean.jodatime.bean.LocalDateTimeBean;
-import org.mapstruct.ap.test.builtin.bean.jodatime.bean.XmlGregorianCalendarBean;
+import org.mapstruct.ap.test.builtin.jodatime.bean.LocalDateTimeBean;
+import org.mapstruct.ap.test.builtin.jodatime.bean.XmlGregorianCalendarBean;
 import org.mapstruct.factory.Mappers;
 
 /**
diff --git a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/LocalDateToXmlGregorianCalendar.java b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/LocalDateToXmlGregorianCalendar.java
similarity index 85%
rename from processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/LocalDateToXmlGregorianCalendar.java
rename to processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/LocalDateToXmlGregorianCalendar.java
index 396fd06fb..6c244ec06 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/LocalDateToXmlGregorianCalendar.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/LocalDateToXmlGregorianCalendar.java
@@ -16,12 +16,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.builtin.bean.jodatime.mapper;
+package org.mapstruct.ap.test.builtin.jodatime.mapper;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.ap.test.builtin.bean.jodatime.bean.LocalDateBean;
-import org.mapstruct.ap.test.builtin.bean.jodatime.bean.XmlGregorianCalendarBean;
+import org.mapstruct.ap.test.builtin.jodatime.bean.LocalDateBean;
+import org.mapstruct.ap.test.builtin.jodatime.bean.XmlGregorianCalendarBean;
 import org.mapstruct.factory.Mappers;
 
 /**
diff --git a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/LocalTimeToXmlGregorianCalendar.java b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/LocalTimeToXmlGregorianCalendar.java
similarity index 85%
rename from processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/LocalTimeToXmlGregorianCalendar.java
rename to processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/LocalTimeToXmlGregorianCalendar.java
index 8c93b13b0..67f8f8e40 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/LocalTimeToXmlGregorianCalendar.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/LocalTimeToXmlGregorianCalendar.java
@@ -16,12 +16,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.builtin.bean.jodatime.mapper;
+package org.mapstruct.ap.test.builtin.jodatime.mapper;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.ap.test.builtin.bean.jodatime.bean.LocalTimeBean;
-import org.mapstruct.ap.test.builtin.bean.jodatime.bean.XmlGregorianCalendarBean;
+import org.mapstruct.ap.test.builtin.jodatime.bean.LocalTimeBean;
+import org.mapstruct.ap.test.builtin.jodatime.bean.XmlGregorianCalendarBean;
 import org.mapstruct.factory.Mappers;
 
 /**
diff --git a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/XmlGregorianCalendarToDateTime.java b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/XmlGregorianCalendarToDateTime.java
similarity index 85%
rename from processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/XmlGregorianCalendarToDateTime.java
rename to processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/XmlGregorianCalendarToDateTime.java
index 5b012ee6f..b75a478c4 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/XmlGregorianCalendarToDateTime.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/XmlGregorianCalendarToDateTime.java
@@ -16,12 +16,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.builtin.bean.jodatime.mapper;
+package org.mapstruct.ap.test.builtin.jodatime.mapper;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.ap.test.builtin.bean.jodatime.bean.DateTimeBean;
-import org.mapstruct.ap.test.builtin.bean.jodatime.bean.XmlGregorianCalendarBean;
+import org.mapstruct.ap.test.builtin.jodatime.bean.DateTimeBean;
+import org.mapstruct.ap.test.builtin.jodatime.bean.XmlGregorianCalendarBean;
 import org.mapstruct.factory.Mappers;
 
 /**
diff --git a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/XmlGregorianCalendarToLocalDate.java b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/XmlGregorianCalendarToLocalDate.java
similarity index 85%
rename from processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/XmlGregorianCalendarToLocalDate.java
rename to processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/XmlGregorianCalendarToLocalDate.java
index 7cf8e1baf..454f06439 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/XmlGregorianCalendarToLocalDate.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/XmlGregorianCalendarToLocalDate.java
@@ -16,12 +16,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.builtin.bean.jodatime.mapper;
+package org.mapstruct.ap.test.builtin.jodatime.mapper;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.ap.test.builtin.bean.jodatime.bean.LocalDateBean;
-import org.mapstruct.ap.test.builtin.bean.jodatime.bean.XmlGregorianCalendarBean;
+import org.mapstruct.ap.test.builtin.jodatime.bean.LocalDateBean;
+import org.mapstruct.ap.test.builtin.jodatime.bean.XmlGregorianCalendarBean;
 import org.mapstruct.factory.Mappers;
 
 /**
diff --git a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/XmlGregorianCalendarToLocalDateTime.java b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/XmlGregorianCalendarToLocalDateTime.java
similarity index 85%
rename from processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/XmlGregorianCalendarToLocalDateTime.java
rename to processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/XmlGregorianCalendarToLocalDateTime.java
index f0953553c..61e216dbe 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/XmlGregorianCalendarToLocalDateTime.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/XmlGregorianCalendarToLocalDateTime.java
@@ -16,12 +16,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.builtin.bean.jodatime.mapper;
+package org.mapstruct.ap.test.builtin.jodatime.mapper;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.ap.test.builtin.bean.jodatime.bean.LocalDateTimeBean;
-import org.mapstruct.ap.test.builtin.bean.jodatime.bean.XmlGregorianCalendarBean;
+import org.mapstruct.ap.test.builtin.jodatime.bean.LocalDateTimeBean;
+import org.mapstruct.ap.test.builtin.jodatime.bean.XmlGregorianCalendarBean;
 import org.mapstruct.factory.Mappers;
 
 /**
diff --git a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/XmlGregorianCalendarToLocalTime.java b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/XmlGregorianCalendarToLocalTime.java
similarity index 85%
rename from processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/XmlGregorianCalendarToLocalTime.java
rename to processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/XmlGregorianCalendarToLocalTime.java
index 230bee1d5..eef150d15 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/jodatime/mapper/XmlGregorianCalendarToLocalTime.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builtin/jodatime/mapper/XmlGregorianCalendarToLocalTime.java
@@ -16,12 +16,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.builtin.bean.jodatime.mapper;
+package org.mapstruct.ap.test.builtin.jodatime.mapper;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.ap.test.builtin.bean.jodatime.bean.LocalTimeBean;
-import org.mapstruct.ap.test.builtin.bean.jodatime.bean.XmlGregorianCalendarBean;
+import org.mapstruct.ap.test.builtin.jodatime.bean.LocalTimeBean;
+import org.mapstruct.ap.test.builtin.jodatime.bean.XmlGregorianCalendarBean;
 import org.mapstruct.factory.Mappers;
 
 /**