diff --git a/modules/swagger-codegen/src/main/resources/Java/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/pom.mustache
index 9f4c858a8a04..df01c6ba14d9 100644
--- a/modules/swagger-codegen/src/main/resources/Java/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/pom.mustache
@@ -108,7 +108,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>com.wordnik</groupId>
+      <groupId>io.swagger</groupId>
       <artifactId>swagger-annotations</artifactId>
       <version>${swagger-annotations-version}</version>
     </dependency>
@@ -157,7 +157,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-annotations-version>1.5.3-M1</swagger-annotations-version>
+    <swagger-annotations-version>1.5.0</swagger-annotations-version>
     <jersey-version>1.18</jersey-version>
     <jackson-version>2.4.2</jackson-version>
     <jodatime-version>2.3</jodatime-version>
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache
index 64cfdc0af231..708ca6cac4d0 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache
@@ -85,7 +85,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>com.wordnik</groupId>
+      <groupId>io.swagger</groupId>
       <artifactId>swagger-jersey-jaxrs</artifactId>
       <version>${swagger-core-version}</version>
     </dependency>
@@ -148,7 +148,7 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-core-version>1.5.2-M2</swagger-core-version>
+    <swagger-core-version>1.5.0</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey-version>1.13</jersey-version>
     <slf4j-version>1.6.3</slf4j-version>
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache
index fc15f492fdf0..fc6a7e557383 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache
@@ -215,7 +215,7 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-core-version>1.5.3-M1-SNAPSHOT</swagger-core-version>
+    <swagger-core-version>1.5.0</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <swagger-ui-version>2.1.0-M2</swagger-ui-version>
     <jersey-version>1.13</jersey-version>
diff --git a/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache b/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache
index 0d65c135957f..f264f38279e6 100644
--- a/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache
@@ -217,7 +217,7 @@
         <akka-version>2.3.9</akka-version>
         <joda-version>1.2</joda-version>
         <joda-time-version>2.2</joda-time-version>
-        <swagger-core-version>1.5.0-M1</swagger-core-version>
+        <swagger-core-version>1.5.0</swagger-core-version>
         <maven-plugin.version>1.0.0</maven-plugin.version>
 
         <junit-version>4.8.1</junit-version>
diff --git a/modules/swagger-codegen/src/main/resources/android-java/build.mustache b/modules/swagger-codegen/src/main/resources/android-java/build.mustache
index 66fcef2a3716..367890f3298c 100644
--- a/modules/swagger-codegen/src/main/resources/android-java/build.mustache
+++ b/modules/swagger-codegen/src/main/resources/android-java/build.mustache
@@ -49,14 +49,14 @@ android {
 
 
 ext {
-    swagger_annotations_version = "1.5.3-M1"
+    swagger_annotations_version = "1.5.0"
     gson_version = "2.3.1"
     httpclient_version = "4.3.3"
     junit_version = "4.8.1"
 }
 
 dependencies {
-    compile "com.wordnik:swagger-annotations:$swagger_annotations_version"
+    compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "com.google.code.gson:gson:$gson_version"
     compile "org.apache.httpcomponents:httpcore:$httpclient_version"
     compile "org.apache.httpcomponents:httpclient:$httpclient_version"
diff --git a/modules/swagger-codegen/src/main/resources/android-java/pom.mustache b/modules/swagger-codegen/src/main/resources/android-java/pom.mustache
index 807df48234d0..9dfa63c25c8f 100644
--- a/modules/swagger-codegen/src/main/resources/android-java/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/android-java/pom.mustache
@@ -108,7 +108,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>com.wordnik</groupId>
+      <groupId>io.swagger</groupId>
       <artifactId>swagger-annotations</artifactId>
       <version>${swagger-annotations-version}</version>
     </dependency>
@@ -145,7 +145,7 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-annotations-version>1.5.1-M1</swagger-annotations-version>
+    <swagger-annotations-version>1.5.0</swagger-annotations-version>
     <gson-version>2.3.1</gson-version>
     <junit-version>4.8.1</junit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
diff --git a/modules/swagger-codegen/src/main/resources/retrofit/pom.mustache b/modules/swagger-codegen/src/main/resources/retrofit/pom.mustache
index fd6318710542..bf3a40c3c25c 100644
--- a/modules/swagger-codegen/src/main/resources/retrofit/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/retrofit/pom.mustache
@@ -108,7 +108,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>com.wordnik</groupId>
+      <groupId>io.swagger</groupId>
       <artifactId>swagger-annotations</artifactId>
       <version>${swagger-annotations-version}</version>
     </dependency>
@@ -134,7 +134,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-annotations-version>1.5.3-M1</swagger-annotations-version>
+    <swagger-annotations-version>1.5.0</swagger-annotations-version>
     <gson-version>2.3.1</gson-version>
     <retrofit-version>1.9.0</retrofit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
diff --git a/modules/swagger-codegen/src/main/resources/scala/pom.mustache b/modules/swagger-codegen/src/main/resources/scala/pom.mustache
index 1163b7d381a7..2d8a1257eb4f 100644
--- a/modules/swagger-codegen/src/main/resources/scala/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/scala/pom.mustache
@@ -177,7 +177,7 @@
       <version>${scala-version}</version>
     </dependency>
     <dependency>
-      <groupId>com.wordnik</groupId>
+      <groupId>io.swagger</groupId>
       <artifactId>swagger-core</artifactId>
       <version>${swagger-core-version}</version>
     </dependency>
@@ -209,7 +209,7 @@
     <joda-version>1.2</joda-version>
     <joda-time-version>2.2</joda-time-version>
     <jersey-version>1.7</jersey-version>
-    <swagger-core-version>1.5.0-M1</swagger-core-version>
+    <swagger-core-version>1.5.0</swagger-core-version>
     <jersey-async-version>1.0.5</jersey-async-version>
     <maven-plugin.version>1.0.0</maven-plugin.version>
     <jackson-version>2.4.2</jackson-version>
diff --git a/samples/client/petstore/android-java/build.gradle b/samples/client/petstore/android-java/build.gradle
index 16ecd1b4d494..028b56beae61 100644
--- a/samples/client/petstore/android-java/build.gradle
+++ b/samples/client/petstore/android-java/build.gradle
@@ -45,14 +45,14 @@ android {
 
 
 ext {
-    swagger_annotations_version = "1.5.3-M1"
+    swagger_annotations_version = "1.5.0"
     gson_version = "2.3.1"
     httpclient_version = "4.3.3"
     junit_version = "4.8.1"
 }
 
 dependencies {
-    compile "com.wordnik:swagger-annotations:$swagger_annotations_version"
+    compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "com.google.code.gson:gson:$gson_version"
     compile "org.apache.httpcomponents:httpcore:$httpclient_version"
     compile "org.apache.httpcomponents:httpclient:$httpclient_version"
diff --git a/samples/client/petstore/android-java/pom.xml b/samples/client/petstore/android-java/pom.xml
index fd961c04d0a3..df929fe52863 100644
--- a/samples/client/petstore/android-java/pom.xml
+++ b/samples/client/petstore/android-java/pom.xml
@@ -108,7 +108,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>com.wordnik</groupId>
+      <groupId>io.swagger</groupId>
       <artifactId>swagger-annotations</artifactId>
       <version>${swagger-annotations-version}</version>
     </dependency>
@@ -145,7 +145,7 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-annotations-version>1.5.1-M1</swagger-annotations-version>
+    <swagger-annotations-version>1.5.0</swagger-annotations-version>
     <gson-version>2.3.1</gson-version>
     <junit-version>4.8.1</junit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Category.java
index 6a001ed16ea9..44c71e8a6208 100644
--- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Category.java
@@ -1,7 +1,7 @@
 package io.swagger.client.model;
 
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
 
 
diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Order.java
index 613864b8e329..f3f42db615c5 100644
--- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Order.java
@@ -2,7 +2,7 @@ package io.swagger.client.model;
 
 import java.util.Date;
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
 
 
diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java
index 93ec8bd9a42f..90a840e6e422 100644
--- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java
@@ -4,7 +4,7 @@ import io.swagger.client.model.Category;
 import io.swagger.client.model.Tag;
 import java.util.*;
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
 
 
diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Tag.java
index fb8d9822e960..7c9651b1ba8e 100644
--- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Tag.java
@@ -1,7 +1,7 @@
 package io.swagger.client.model;
 
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
 
 
diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/User.java
index 9a46e0a904d0..dc022697eb0f 100644
--- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/User.java
@@ -1,7 +1,7 @@
 package io.swagger.client.model;
 
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
 
 
diff --git a/samples/client/petstore/java/pom.xml b/samples/client/petstore/java/pom.xml
index 82e70d8105b4..7b134c852227 100644
--- a/samples/client/petstore/java/pom.xml
+++ b/samples/client/petstore/java/pom.xml
@@ -108,7 +108,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>com.wordnik</groupId>
+      <groupId>io.swagger</groupId>
       <artifactId>swagger-annotations</artifactId>
       <version>${swagger-annotations-version}</version>
     </dependency>
@@ -157,7 +157,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-annotations-version>1.5.3-M1</swagger-annotations-version>
+    <swagger-annotations-version>1.5.0</swagger-annotations-version>
     <jersey-version>1.18</jersey-version>
     <jackson-version>2.4.2</jackson-version>
     <jodatime-version>2.3</jodatime-version>
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Category.java
index ad67267a2f6c..d43f6a9758fb 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Category.java
@@ -1,7 +1,7 @@
 package io.swagger.client.model;
 
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Order.java
index b9f7d1dc8975..25864d8c9cc8 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Order.java
@@ -2,7 +2,7 @@ package io.swagger.client.model;
 
 import java.util.Date;
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java
index d685a8c1cbf7..cf7ace02309c 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java
@@ -4,7 +4,7 @@ import io.swagger.client.model.Category;
 import io.swagger.client.model.Tag;
 import java.util.*;
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Tag.java
index b9dddc92f1bf..63a2ca3b7390 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Tag.java
@@ -1,7 +1,7 @@
 package io.swagger.client.model;
 
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/src/main/java/io/swagger/client/model/User.java
index 9811a7741f91..0ace5b7e30a3 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/model/User.java
@@ -1,7 +1,7 @@
 package io.swagger.client.model;
 
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
diff --git a/samples/client/petstore/objc/pom.xml b/samples/client/petstore/objc/pom.xml
index 42e116ac1706..bf209a7db96f 100644
--- a/samples/client/petstore/objc/pom.xml
+++ b/samples/client/petstore/objc/pom.xml
@@ -1,6 +1,6 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.wordnik</groupId>
+  <groupId>io.swagger</groupId>
   <artifactId>ObjcPetstoreClientTests</artifactId>
   <packaging>pom</packaging>
   <version>1.0-SNAPSHOT</version>
diff --git a/samples/client/petstore/retrofit/pom.xml b/samples/client/petstore/retrofit/pom.xml
index 4a95855cac97..7177c69dcc9c 100644
--- a/samples/client/petstore/retrofit/pom.xml
+++ b/samples/client/petstore/retrofit/pom.xml
@@ -108,7 +108,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>com.wordnik</groupId>
+      <groupId>io.swagger</groupId>
       <artifactId>swagger-annotations</artifactId>
       <version>${swagger-annotations-version}</version>
     </dependency>
@@ -134,7 +134,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-annotations-version>1.5.3-M1</swagger-annotations-version>
+    <swagger-annotations-version>1.5.0</swagger-annotations-version>
     <gson-version>2.3.1</gson-version>
     <retrofit-version>1.9.0</retrofit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
diff --git a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Category.java
index 8ba10d629dca..7f89bcf57a07 100644
--- a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Category.java
@@ -1,7 +1,7 @@
 package io.swagger.client.model;
 
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
 
 
diff --git a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Order.java
index d7d0b2d92822..6be69df18c95 100644
--- a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Order.java
@@ -2,7 +2,7 @@ package io.swagger.client.model;
 
 import java.util.Date;
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
 
 
diff --git a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Pet.java
index 3ae042397444..b6935a7c1e37 100644
--- a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Pet.java
@@ -4,7 +4,7 @@ import io.swagger.client.model.Category;
 import io.swagger.client.model.Tag;
 import java.util.*;
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
 
 
diff --git a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Tag.java
index e6ddd4c92cdd..c1a317bc45c0 100644
--- a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/Tag.java
@@ -1,7 +1,7 @@
 package io.swagger.client.model;
 
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
 
 
diff --git a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/User.java
index f42f77b9773a..3beca5c5e867 100644
--- a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/model/User.java
@@ -1,7 +1,7 @@
 package io.swagger.client.model;
 
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
 
 
diff --git a/samples/client/petstore/scala/pom.xml b/samples/client/petstore/scala/pom.xml
index 74bb2feed866..7e56a41c890b 100644
--- a/samples/client/petstore/scala/pom.xml
+++ b/samples/client/petstore/scala/pom.xml
@@ -177,7 +177,7 @@
       <version>${scala-version}</version>
     </dependency>
     <dependency>
-      <groupId>com.wordnik</groupId>
+      <groupId>io.swagger</groupId>
       <artifactId>swagger-core</artifactId>
       <version>${swagger-core-version}</version>
     </dependency>
@@ -209,7 +209,7 @@
     <joda-version>1.2</joda-version>
     <joda-time-version>2.2</joda-time-version>
     <jersey-version>1.7</jersey-version>
-    <swagger-core-version>1.5.0-M1</swagger-core-version>
+    <swagger-core-version>1.5.0</swagger-core-version>
     <jersey-async-version>1.0.5</jersey-async-version>
     <maven-plugin.version>1.0.0</maven-plugin.version>
     <jackson-version>2.4.2</jackson-version>
diff --git a/samples/html/index.html b/samples/html/index.html
index e595d3ea40d6..caaa4152984b 100644
--- a/samples/html/index.html
+++ b/samples/html/index.html
@@ -332,7 +332,7 @@
   &quot;complete&quot; : true,
   &quot;status&quot; : &quot;aeiou&quot;,
   &quot;quantity&quot; : 123,
-  &quot;shipDate&quot; : &quot;2015-06-07T06:42:05.171+0000&quot;
+  &quot;shipDate&quot; : &quot;2015-06-07T06:51:26.728+0000&quot;
 }</code></pre>
     
     <h3 class="field-label">Example data</h3>
@@ -341,7 +341,7 @@
   &lt;id&gt;123456&lt;/id&gt;
   &lt;petId&gt;123456&lt;/petId&gt;
   &lt;quantity&gt;0&lt;/quantity&gt;
-  &lt;shipDate&gt;2015-06-06T23:42:05.174Z&lt;/shipDate&gt;
+  &lt;shipDate&gt;2015-06-06T23:51:26.731Z&lt;/shipDate&gt;
   &lt;status&gt;string&lt;/status&gt;
   &lt;complete&gt;true&lt;/complete&gt;
 &lt;/Order&gt;</code></pre>
@@ -375,7 +375,7 @@
   &quot;complete&quot; : true,
   &quot;status&quot; : &quot;aeiou&quot;,
   &quot;quantity&quot; : 123,
-  &quot;shipDate&quot; : &quot;2015-06-07T06:42:05.175+0000&quot;
+  &quot;shipDate&quot; : &quot;2015-06-07T06:51:26.732+0000&quot;
 }</code></pre>
     
     <h3 class="field-label">Example data</h3>
@@ -384,7 +384,7 @@
   &lt;id&gt;123456&lt;/id&gt;
   &lt;petId&gt;123456&lt;/petId&gt;
   &lt;quantity&gt;0&lt;/quantity&gt;
-  &lt;shipDate&gt;2015-06-06T23:42:05.176Z&lt;/shipDate&gt;
+  &lt;shipDate&gt;2015-06-06T23:51:26.732Z&lt;/shipDate&gt;
   &lt;status&gt;string&lt;/status&gt;
   &lt;complete&gt;true&lt;/complete&gt;
 &lt;/Order&gt;</code></pre>
diff --git a/samples/server/petstore/jaxrs/pom.xml b/samples/server/petstore/jaxrs/pom.xml
index 825dec0f766f..cac2f6daf795 100644
--- a/samples/server/petstore/jaxrs/pom.xml
+++ b/samples/server/petstore/jaxrs/pom.xml
@@ -85,7 +85,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>com.wordnik</groupId>
+      <groupId>io.swagger</groupId>
       <artifactId>swagger-jersey-jaxrs</artifactId>
       <version>${swagger-core-version}</version>
     </dependency>
@@ -148,7 +148,7 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-core-version>1.5.2-M2</swagger-core-version>
+    <swagger-core-version>1.5.0</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey-version>1.13</jersey-version>
     <slf4j-version>1.6.3</slf4j-version>
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApi.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApi.java
index e67773ed6345..055fa75c80bc 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/PetApi.java
@@ -4,7 +4,7 @@ import io.swagger.model.*;
 import io.swagger.api.PetApiService;
 import io.swagger.api.factories.PetApiServiceFactory;
 
-import com.wordnik.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiParam;
 
 import com.sun.jersey.multipart.FormDataParam;
 
@@ -25,7 +25,7 @@ import javax.ws.rs.*;
 @Path("/pet")
 
 
-@com.wordnik.swagger.annotations.Api(value = "/pet", description = "the pet API")
+@io.swagger.annotations.Api(value = "/pet", description = "the pet API")
 public class PetApi  {
 
    private final PetApiService delegate = PetApiServiceFactory.getPetApi();
@@ -34,13 +34,13 @@ public class PetApi  {
     
     @Consumes({ "application/json", "application/xml" })
     @Produces({ "application/json", "application/xml" })
-    @com.wordnik.swagger.annotations.ApiOperation(value = "Update an existing pet", notes = "", response = Void.class)
-    @com.wordnik.swagger.annotations.ApiResponses(value = { 
-        @com.wordnik.swagger.annotations.ApiResponse(code = 405, message = "Validation exception"),
+    @io.swagger.annotations.ApiOperation(value = "Update an existing pet", notes = "", response = Void.class)
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 405, message = "Validation exception"),
         
-        @com.wordnik.swagger.annotations.ApiResponse(code = 404, message = "Pet not found"),
+        @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found"),
         
-        @com.wordnik.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied") })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied") })
 
     public Response updatePet(@ApiParam(value = "Pet object that needs to be added to the store"  ) Pet body)
     throws NotFoundException {
@@ -50,9 +50,9 @@ public class PetApi  {
     
     @Consumes({ "application/json", "application/xml" })
     @Produces({ "application/json", "application/xml" })
-    @com.wordnik.swagger.annotations.ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class)
-    @com.wordnik.swagger.annotations.ApiResponses(value = { 
-        @com.wordnik.swagger.annotations.ApiResponse(code = 405, message = "Invalid input") })
+    @io.swagger.annotations.ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class)
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input") })
 
     public Response addPet(@ApiParam(value = "Pet object that needs to be added to the store"  ) Pet body)
     throws NotFoundException {
@@ -62,11 +62,11 @@ public class PetApi  {
     @Path("/findByStatus")
     
     @Produces({ "application/json", "application/xml" })
-    @com.wordnik.swagger.annotations.ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma seperated strings", response = Pet.class, responseContainer = "List")
-    @com.wordnik.swagger.annotations.ApiResponses(value = { 
-        @com.wordnik.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+    @io.swagger.annotations.ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma seperated strings", response = Pet.class, responseContainer = "List")
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
         
-        @com.wordnik.swagger.annotations.ApiResponse(code = 400, message = "Invalid status value") })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid status value") })
 
     public Response findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter", defaultValue="available") @QueryParam("status") List<String> status)
     throws NotFoundException {
@@ -76,11 +76,11 @@ public class PetApi  {
     @Path("/findByTags")
     
     @Produces({ "application/json", "application/xml" })
-    @com.wordnik.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List")
-    @com.wordnik.swagger.annotations.ApiResponses(value = { 
-        @com.wordnik.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+    @io.swagger.annotations.ApiOperation(value = "Finds Pets by tags", notes = "Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List")
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
         
-        @com.wordnik.swagger.annotations.ApiResponse(code = 400, message = "Invalid tag value") })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid tag value") })
 
     public Response findPetsByTags(@ApiParam(value = "Tags to filter by") @QueryParam("tags") List<String> tags)
     throws NotFoundException {
@@ -90,13 +90,13 @@ public class PetApi  {
     @Path("/{petId}")
     
     @Produces({ "application/json", "application/xml" })
-    @com.wordnik.swagger.annotations.ApiOperation(value = "Find pet by ID", notes = "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions", response = Pet.class)
-    @com.wordnik.swagger.annotations.ApiResponses(value = { 
-        @com.wordnik.swagger.annotations.ApiResponse(code = 404, message = "Pet not found"),
+    @io.swagger.annotations.ApiOperation(value = "Find pet by ID", notes = "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions", response = Pet.class)
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 404, message = "Pet not found"),
         
-        @com.wordnik.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
         
-        @com.wordnik.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied") })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied") })
 
     public Response getPetById(@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathParam("petId") Long petId)
     throws NotFoundException {
@@ -106,9 +106,9 @@ public class PetApi  {
     @Path("/{petId}")
     @Consumes({ "application/x-www-form-urlencoded" })
     @Produces({ "application/json", "application/xml" })
-    @com.wordnik.swagger.annotations.ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class)
-    @com.wordnik.swagger.annotations.ApiResponses(value = { 
-        @com.wordnik.swagger.annotations.ApiResponse(code = 405, message = "Invalid input") })
+    @io.swagger.annotations.ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class)
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 405, message = "Invalid input") })
 
     public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated",required=true ) @PathParam("petId") String petId,
     @ApiParam(value = "Updated name of the pet" )@FormParam("name")  String name,
@@ -120,9 +120,9 @@ public class PetApi  {
     @Path("/{petId}")
     
     @Produces({ "application/json", "application/xml" })
-    @com.wordnik.swagger.annotations.ApiOperation(value = "Deletes a pet", notes = "", response = Void.class)
-    @com.wordnik.swagger.annotations.ApiResponses(value = { 
-        @com.wordnik.swagger.annotations.ApiResponse(code = 400, message = "Invalid pet value") })
+    @io.swagger.annotations.ApiOperation(value = "Deletes a pet", notes = "", response = Void.class)
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid pet value") })
 
     public Response deletePet(@ApiParam(value = ""  )@HeaderParam("api_key") String apiKey,
     @ApiParam(value = "Pet id to delete",required=true ) @PathParam("petId") Long petId)
@@ -133,9 +133,9 @@ public class PetApi  {
     @Path("/{petId}/uploadImage")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json", "application/xml" })
-    @com.wordnik.swagger.annotations.ApiOperation(value = "uploads an image", notes = "", response = Void.class)
-    @com.wordnik.swagger.annotations.ApiResponses(value = { 
-        @com.wordnik.swagger.annotations.ApiResponse(code = 0, message = "successful operation") })
+    @io.swagger.annotations.ApiOperation(value = "uploads an image", notes = "", response = Void.class)
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 0, message = "successful operation") })
 
     public Response uploadFile(@ApiParam(value = "ID of pet to update",required=true ) @PathParam("petId") Long petId,
     @ApiParam(value = "Additional data to pass to server" )@FormParam("additionalMetadata")  String additionalMetadata,
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApi.java
index 790d4c4c3f61..f5215862ba78 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/StoreApi.java
@@ -4,7 +4,7 @@ import io.swagger.model.*;
 import io.swagger.api.StoreApiService;
 import io.swagger.api.factories.StoreApiServiceFactory;
 
-import com.wordnik.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiParam;
 
 import com.sun.jersey.multipart.FormDataParam;
 
@@ -25,7 +25,7 @@ import javax.ws.rs.*;
 @Path("/store")
 
 
-@com.wordnik.swagger.annotations.Api(value = "/store", description = "the store API")
+@io.swagger.annotations.Api(value = "/store", description = "the store API")
 public class StoreApi  {
 
    private final StoreApiService delegate = StoreApiServiceFactory.getStoreApi();
@@ -34,9 +34,9 @@ public class StoreApi  {
     @Path("/inventory")
     
     @Produces({ "application/json", "application/xml" })
-    @com.wordnik.swagger.annotations.ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "map")
-    @com.wordnik.swagger.annotations.ApiResponses(value = { 
-        @com.wordnik.swagger.annotations.ApiResponse(code = 200, message = "successful operation") })
+    @io.swagger.annotations.ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "map")
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation") })
 
     public Response getInventory()
     throws NotFoundException {
@@ -46,11 +46,11 @@ public class StoreApi  {
     @Path("/order")
     
     @Produces({ "application/json", "application/xml" })
-    @com.wordnik.swagger.annotations.ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class)
-    @com.wordnik.swagger.annotations.ApiResponses(value = { 
-        @com.wordnik.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+    @io.swagger.annotations.ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class)
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
         
-        @com.wordnik.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order") })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid Order") })
 
     public Response placeOrder(@ApiParam(value = "order placed for purchasing the pet"  ) Order body)
     throws NotFoundException {
@@ -60,13 +60,13 @@ public class StoreApi  {
     @Path("/order/{orderId}")
     
     @Produces({ "application/json", "application/xml" })
-    @com.wordnik.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class)
-    @com.wordnik.swagger.annotations.ApiResponses(value = { 
-        @com.wordnik.swagger.annotations.ApiResponse(code = 404, message = "Order not found"),
+    @io.swagger.annotations.ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class)
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found"),
         
-        @com.wordnik.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
         
-        @com.wordnik.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied") })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied") })
 
     public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathParam("orderId") String orderId)
     throws NotFoundException {
@@ -76,11 +76,11 @@ public class StoreApi  {
     @Path("/order/{orderId}")
     
     @Produces({ "application/json", "application/xml" })
-    @com.wordnik.swagger.annotations.ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class)
-    @com.wordnik.swagger.annotations.ApiResponses(value = { 
-        @com.wordnik.swagger.annotations.ApiResponse(code = 404, message = "Order not found"),
+    @io.swagger.annotations.ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class)
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 404, message = "Order not found"),
         
-        @com.wordnik.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied") })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid ID supplied") })
 
     public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathParam("orderId") String orderId)
     throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApi.java
index 979476c41c61..f904b77746b4 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApi.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/api/UserApi.java
@@ -4,7 +4,7 @@ import io.swagger.model.*;
 import io.swagger.api.UserApiService;
 import io.swagger.api.factories.UserApiServiceFactory;
 
-import com.wordnik.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiParam;
 
 import com.sun.jersey.multipart.FormDataParam;
 
@@ -25,7 +25,7 @@ import javax.ws.rs.*;
 @Path("/user")
 
 
-@com.wordnik.swagger.annotations.Api(value = "/user", description = "the user API")
+@io.swagger.annotations.Api(value = "/user", description = "the user API")
 public class UserApi  {
 
    private final UserApiService delegate = UserApiServiceFactory.getUserApi();
@@ -34,9 +34,9 @@ public class UserApi  {
     
     
     @Produces({ "application/json", "application/xml" })
-    @com.wordnik.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class)
-    @com.wordnik.swagger.annotations.ApiResponses(value = { 
-        @com.wordnik.swagger.annotations.ApiResponse(code = 0, message = "successful operation") })
+    @io.swagger.annotations.ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class)
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 0, message = "successful operation") })
 
     public Response createUser(@ApiParam(value = "Created user object"  ) User body)
     throws NotFoundException {
@@ -46,9 +46,9 @@ public class UserApi  {
     @Path("/createWithArray")
     
     @Produces({ "application/json", "application/xml" })
-    @com.wordnik.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
-    @com.wordnik.swagger.annotations.ApiResponses(value = { 
-        @com.wordnik.swagger.annotations.ApiResponse(code = 0, message = "successful operation") })
+    @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 0, message = "successful operation") })
 
     public Response createUsersWithArrayInput(@ApiParam(value = "List of user object"  ) List<User> body)
     throws NotFoundException {
@@ -58,9 +58,9 @@ public class UserApi  {
     @Path("/createWithList")
     
     @Produces({ "application/json", "application/xml" })
-    @com.wordnik.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
-    @com.wordnik.swagger.annotations.ApiResponses(value = { 
-        @com.wordnik.swagger.annotations.ApiResponse(code = 0, message = "successful operation") })
+    @io.swagger.annotations.ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 0, message = "successful operation") })
 
     public Response createUsersWithListInput(@ApiParam(value = "List of user object"  ) List<User> body)
     throws NotFoundException {
@@ -70,11 +70,11 @@ public class UserApi  {
     @Path("/login")
     
     @Produces({ "application/json", "application/xml" })
-    @com.wordnik.swagger.annotations.ApiOperation(value = "Logs user into the system", notes = "", response = String.class)
-    @com.wordnik.swagger.annotations.ApiResponses(value = { 
-        @com.wordnik.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+    @io.swagger.annotations.ApiOperation(value = "Logs user into the system", notes = "", response = String.class)
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
         
-        @com.wordnik.swagger.annotations.ApiResponse(code = 400, message = "Invalid username/password supplied") })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username/password supplied") })
 
     public Response loginUser(@ApiParam(value = "The user name for login") @QueryParam("username") String username,
     @ApiParam(value = "The password for login in clear text") @QueryParam("password") String password)
@@ -85,9 +85,9 @@ public class UserApi  {
     @Path("/logout")
     
     @Produces({ "application/json", "application/xml" })
-    @com.wordnik.swagger.annotations.ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class)
-    @com.wordnik.swagger.annotations.ApiResponses(value = { 
-        @com.wordnik.swagger.annotations.ApiResponse(code = 0, message = "successful operation") })
+    @io.swagger.annotations.ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class)
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 0, message = "successful operation") })
 
     public Response logoutUser()
     throws NotFoundException {
@@ -97,13 +97,13 @@ public class UserApi  {
     @Path("/{username}")
     
     @Produces({ "application/json", "application/xml" })
-    @com.wordnik.swagger.annotations.ApiOperation(value = "Get user by user name", notes = "", response = User.class)
-    @com.wordnik.swagger.annotations.ApiResponses(value = { 
-        @com.wordnik.swagger.annotations.ApiResponse(code = 404, message = "User not found"),
+    @io.swagger.annotations.ApiOperation(value = "Get user by user name", notes = "", response = User.class)
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found"),
         
-        @com.wordnik.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
+        @io.swagger.annotations.ApiResponse(code = 200, message = "successful operation"),
         
-        @com.wordnik.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied") })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied") })
 
     public Response getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing. ",required=true ) @PathParam("username") String username)
     throws NotFoundException {
@@ -113,11 +113,11 @@ public class UserApi  {
     @Path("/{username}")
     
     @Produces({ "application/json", "application/xml" })
-    @com.wordnik.swagger.annotations.ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class)
-    @com.wordnik.swagger.annotations.ApiResponses(value = { 
-        @com.wordnik.swagger.annotations.ApiResponse(code = 404, message = "User not found"),
+    @io.swagger.annotations.ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class)
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found"),
         
-        @com.wordnik.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied") })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid user supplied") })
 
     public Response updateUser(@ApiParam(value = "name that need to be deleted",required=true ) @PathParam("username") String username,
     @ApiParam(value = "Updated user object"  ) User body)
@@ -128,11 +128,11 @@ public class UserApi  {
     @Path("/{username}")
     
     @Produces({ "application/json", "application/xml" })
-    @com.wordnik.swagger.annotations.ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class)
-    @com.wordnik.swagger.annotations.ApiResponses(value = { 
-        @com.wordnik.swagger.annotations.ApiResponse(code = 404, message = "User not found"),
+    @io.swagger.annotations.ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class)
+    @io.swagger.annotations.ApiResponses(value = { 
+        @io.swagger.annotations.ApiResponse(code = 404, message = "User not found"),
         
-        @com.wordnik.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied") })
+        @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied") })
 
     public Response deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true ) @PathParam("username") String username)
     throws NotFoundException {
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Category.java
index 98cc0b4d2734..56f86f70737c 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Category.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Category.java
@@ -1,7 +1,7 @@
 package io.swagger.model;
 
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Order.java
index cff15e3bd2a7..4d0c133e9362 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Order.java
@@ -2,7 +2,7 @@ package io.swagger.model;
 
 import java.util.Date;
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Pet.java
index e8503c6bd313..3b89931c47bc 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Pet.java
@@ -4,7 +4,7 @@ import io.swagger.model.Category;
 import io.swagger.model.Tag;
 import java.util.*;
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Tag.java
index d99a24f8cc14..99dd07c00f7a 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Tag.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/Tag.java
@@ -1,7 +1,7 @@
 package io.swagger.model;
 
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
diff --git a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/User.java
index 24d707e921fc..d5f43a4c25e8 100644
--- a/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/User.java
+++ b/samples/server/petstore/jaxrs/src/gen/java/io/swagger/model/User.java
@@ -1,7 +1,7 @@
 package io.swagger.model;
 
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
diff --git a/samples/server/petstore/jaxrs/src/main/webapp/WEB-INF/web.xml b/samples/server/petstore/jaxrs/src/main/webapp/WEB-INF/web.xml
index 0dde6168d623..80df1cd180db 100644
--- a/samples/server/petstore/jaxrs/src/main/webapp/WEB-INF/web.xml
+++ b/samples/server/petstore/jaxrs/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
     <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
     <init-param>
       <param-name>com.sun.jersey.config.property.packages</param-name>
-      <param-value>com.wordnik.swagger.jaxrs.json;com.wordnik.swagger.jaxrs.listing;io.swagger.api</param-value>
+      <param-value>io.swagger.jaxrs.json;io.swagger.jaxrs.listing;io.swagger.api</param-value>
     </init-param>
     <init-param>
       <param-name>com.sun.jersey.spi.container.ContainerRequestFilters</param-name>
@@ -23,7 +23,7 @@
 
   <servlet>
     <servlet-name>DefaultJaxrsConfig</servlet-name>
-    <servlet-class>com.wordnik.swagger.jaxrs.config.DefaultJaxrsConfig</servlet-class>
+    <servlet-class>io.swagger.jaxrs.config.DefaultJaxrsConfig</servlet-class>
     <init-param>
       <param-name>api.version</param-name>
       <param-value>1.0.0</param-value>
diff --git a/samples/server/petstore/spring-mvc/pom.xml b/samples/server/petstore/spring-mvc/pom.xml
index 5f6ab531f109..71cdd259658f 100644
--- a/samples/server/petstore/spring-mvc/pom.xml
+++ b/samples/server/petstore/spring-mvc/pom.xml
@@ -215,7 +215,7 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-core-version>1.5.3-M1-SNAPSHOT</swagger-core-version>
+    <swagger-core-version>1.5.0</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <swagger-ui-version>2.1.0-M2</swagger-ui-version>
     <jersey-version>1.13</jersey-version>
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java
index a39a8e70970e..6264ec785679 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java
@@ -5,11 +5,11 @@ import io.swagger.model.*;
 import io.swagger.model.Pet;
 import java.io.File;
 
-import com.wordnik.swagger.annotations.Api;
-import com.wordnik.swagger.annotations.ApiOperation;
-import com.wordnik.swagger.annotations.ApiParam;
-import com.wordnik.swagger.annotations.ApiResponse;
-import com.wordnik.swagger.annotations.ApiResponses;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java
index ba6e233ce9c1..c81693887db1 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java
@@ -5,11 +5,11 @@ import io.swagger.model.*;
 import java.util.Map;
 import io.swagger.model.Order;
 
-import com.wordnik.swagger.annotations.Api;
-import com.wordnik.swagger.annotations.ApiOperation;
-import com.wordnik.swagger.annotations.ApiParam;
-import com.wordnik.swagger.annotations.ApiResponse;
-import com.wordnik.swagger.annotations.ApiResponses;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java
index 15b170e90a70..35227db7c677 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java
@@ -5,11 +5,11 @@ import io.swagger.model.*;
 import io.swagger.model.User;
 import java.util.*;
 
-import com.wordnik.swagger.annotations.Api;
-import com.wordnik.swagger.annotations.ApiOperation;
-import com.wordnik.swagger.annotations.ApiParam;
-import com.wordnik.swagger.annotations.ApiResponse;
-import com.wordnik.swagger.annotations.ApiResponses;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java
index 98cc0b4d2734..56f86f70737c 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java
@@ -1,7 +1,7 @@
 package io.swagger.model;
 
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Order.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Order.java
index cff15e3bd2a7..4d0c133e9362 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Order.java
@@ -2,7 +2,7 @@ package io.swagger.model;
 
 import java.util.Date;
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Pet.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Pet.java
index e8503c6bd313..3b89931c47bc 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Pet.java
@@ -4,7 +4,7 @@ import io.swagger.model.Category;
 import io.swagger.model.Tag;
 import java.util.*;
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Tag.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Tag.java
index d99a24f8cc14..99dd07c00f7a 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Tag.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Tag.java
@@ -1,7 +1,7 @@
 package io.swagger.model;
 
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/User.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/User.java
index 24d707e921fc..d5f43a4c25e8 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/User.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/User.java
@@ -1,7 +1,7 @@
 package io.swagger.model;
 
 
-import com.wordnik.swagger.annotations.*;
+import io.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;