diff --git a/modules/swagger-annotations/pom.xml b/modules/swagger-annotations/pom.xml
index af695a4636..6f7baec38c 100644
--- a/modules/swagger-annotations/pom.xml
+++ b/modules/swagger-annotations/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>io.swagger</groupId>
+        <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project</artifactId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.swagger</groupId>
+    <groupId>io.swagger.core.v3</groupId>
     <artifactId>swagger-annotations</artifactId>
     <version>2.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
diff --git a/modules/swagger-core/pom.xml b/modules/swagger-core/pom.xml
index 066b9a44f1..e681dd100c 100644
--- a/modules/swagger-core/pom.xml
+++ b/modules/swagger-core/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <groupId>io.swagger</groupId>
+        <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project</artifactId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../..</relativePath>
@@ -69,12 +69,12 @@
             <artifactId>jackson-dataformat-yaml</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.swagger</groupId>
+            <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-annotations</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
-            <groupId>io.swagger</groupId>
+            <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-models</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
diff --git a/modules/swagger-core/src/test/java/io/swagger/oas/models/ModelWithTuple2.java b/modules/swagger-core/src/test/java/io/swagger/oas/models/ModelWithTuple2.java
index ba4704e546..8485c79211 100644
--- a/modules/swagger-core/src/test/java/io/swagger/oas/models/ModelWithTuple2.java
+++ b/modules/swagger-core/src/test/java/io/swagger/oas/models/ModelWithTuple2.java
@@ -15,8 +15,6 @@
 import java.util.Iterator;
 import java.util.Set;
 
-//import io.swagger.oas.annotations.media.Schema;
-
 public class ModelWithTuple2 {
     @io.swagger.oas.annotations.media.Schema(description = "Possible values for state property of timesheet or timesheet entry", required = true)
     public Pair<String, String> timesheetStates;
diff --git a/modules/swagger-hibernate-validations/pom.xml b/modules/swagger-hibernate-validations/pom.xml
index f9993c33c9..4d84dea042 100644
--- a/modules/swagger-hibernate-validations/pom.xml
+++ b/modules/swagger-hibernate-validations/pom.xml
@@ -2,13 +2,13 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <groupId>io.swagger</groupId>
+        <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project</artifactId>
         <version>1.5.13-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.swagger</groupId>
+    <groupId>io.swagger.core.v3</groupId>
     <artifactId>swagger-hibernate-validations</artifactId>
     <packaging>jar</packaging>
     <version>1.5.13-SNAPSHOT</version>
@@ -52,7 +52,7 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>io.swagger</groupId>
+            <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-jaxrs</artifactId>
             <version>${project.parent.version}</version>
             <exclusions>
diff --git a/modules/swagger-integration/pom.xml b/modules/swagger-integration/pom.xml
index 0609b64725..04615cdb40 100644
--- a/modules/swagger-integration/pom.xml
+++ b/modules/swagger-integration/pom.xml
@@ -4,12 +4,12 @@
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>io.swagger</groupId>
+		<groupId>io.swagger.core.v3</groupId>
 		<artifactId>swagger-project</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
-	<groupId>io.swagger</groupId>
+	<groupId>io.swagger.core.v3</groupId>
 	<artifactId>swagger-integration</artifactId>
 	<version>2.0.0-SNAPSHOT</version>
 	<packaging>bundle</packaging>
@@ -30,12 +30,12 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>io.swagger</groupId>
+			<groupId>io.swagger.core.v3</groupId>
 			<artifactId>swagger-core</artifactId>
 			<version>${swagger.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>io.swagger</groupId>
+			<groupId>io.swagger.core.v3</groupId>
 			<artifactId>swagger-models</artifactId>
 			<version>${swagger.version}</version>
 		</dependency>
diff --git a/modules/swagger-jaxrs2/pom.xml b/modules/swagger-jaxrs2/pom.xml
index 09e3baa761..acd9108e11 100644
--- a/modules/swagger-jaxrs2/pom.xml
+++ b/modules/swagger-jaxrs2/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>swagger-project</artifactId>
-        <groupId>io.swagger</groupId>
+        <groupId>io.swagger.core.v3</groupId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
@@ -129,17 +129,17 @@
             <artifactId>commons-io</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.swagger</groupId>
+            <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-models</artifactId>
             <version>${models.version}</version>
         </dependency>
         <dependency>
-            <groupId>io.swagger</groupId>
+            <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-annotations</artifactId>
             <version>${annotations.version}</version>
         </dependency>
         <dependency>
-            <groupId>io.swagger</groupId>
+            <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-integration</artifactId>
             <version>${integration.version}</version>
         </dependency>
diff --git a/modules/swagger-models/pom.xml b/modules/swagger-models/pom.xml
index 974e18fa36..c340bda837 100644
--- a/modules/swagger-models/pom.xml
+++ b/modules/swagger-models/pom.xml
@@ -2,7 +2,7 @@
 	xmlns="http://maven.apache.org/POM/4.0.0"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <groupId>io.swagger</groupId>
+        <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project</artifactId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../..</relativePath>
diff --git a/modules/swagger-servlet/pom.xml b/modules/swagger-servlet/pom.xml
index dbe04f6172..c317a4d154 100644
--- a/modules/swagger-servlet/pom.xml
+++ b/modules/swagger-servlet/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <groupId>io.swagger</groupId>
+        <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project</artifactId>
         <version>1.5.13-SNAPSHOT</version>
         <relativePath>../..</relativePath>
@@ -30,7 +30,7 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>io.swagger</groupId>
+            <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-core</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
diff --git a/pom.xml b/pom.xml
index 31f6fd9107..a3126d852b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
         <version>5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.swagger</groupId>
+    <groupId>io.swagger.core.v3</groupId>
     <artifactId>swagger-project</artifactId>
     <packaging>pom</packaging>
     <name>swagger-project</name>