diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java
index 9e9c41d9a06..78e740b8fa4 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java
@@ -20,20 +20,11 @@ package org.openapitools.codegen.languages;
 import com.google.common.base.CaseFormat;
 import com.samskivert.mustache.Mustache;
 import com.samskivert.mustache.Template;
-
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.security.SecurityScheme;
-
 import org.apache.commons.lang3.StringUtils;
-import org.openapitools.codegen.CodegenConfig;
-import org.openapitools.codegen.CodegenConstants;
-import org.openapitools.codegen.CodegenOperation;
-import org.openapitools.codegen.CodegenProperty;
-import org.openapitools.codegen.CodegenResponse;
-import org.openapitools.codegen.CodegenSecurity;
-import org.openapitools.codegen.CodegenType;
-import org.openapitools.codegen.SupportingFile;
+import org.openapitools.codegen.*;
 import org.openapitools.codegen.utils.ModelUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,17 +33,11 @@ import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class ScalaAkkaClientCodegen extends AbstractScalaCodegen implements CodegenConfig {
-    protected String mainPackage = "io.swagger.client";
-    protected String groupId = "io.swagger";
+    protected String mainPackage = "org.openapitools.client";
+    protected String groupId = "org.openapitools";
     protected String artifactId = "openapi-client";
     protected String artifactVersion = "1.0.0";
     protected String resourcesFolder = "src/main/resources";
@@ -75,7 +60,7 @@ public class ScalaAkkaClientCodegen extends AbstractScalaCodegen implements Code
 
     public ScalaAkkaClientCodegen() {
         super();
-        outputFolder = "generated-code/scala";
+        outputFolder = "generated-code/scala-akka";
         modelTemplateFiles.put("model.mustache", ".scala");
         apiTemplateFiles.put("api.mustache", ".scala");
         embeddedTemplateDir = templateDir = "akka-scala";
@@ -106,18 +91,7 @@ public class ScalaAkkaClientCodegen extends AbstractScalaCodegen implements Code
         additionalProperties.put("fnCamelize", new CamelizeLambda(false));
         additionalProperties.put("fnEnumEntry", new EnumEntryLambda());
         additionalProperties.put("onlyOneSuccess", onlyOneSuccess);
-
-        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
-        supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
-        supportingFiles.add(new SupportingFile("build.sbt.mustache", "", "build.sbt"));
-        supportingFiles.add(new SupportingFile("reference.mustache", resourcesFolder, "reference.conf"));
-        final String invokerFolder = (sourceFolder + File.separator + invokerPackage).replace(".", File.separator);
-        supportingFiles.add(new SupportingFile("apiRequest.mustache", invokerFolder, "ApiRequest.scala"));
-        supportingFiles.add(new SupportingFile("apiInvoker.mustache", invokerFolder, "ApiInvoker.scala"));
-        supportingFiles.add(new SupportingFile("requests.mustache", invokerFolder, "requests.scala"));
-        supportingFiles.add(new SupportingFile("apiSettings.mustache", invokerFolder, "ApiSettings.scala"));
-        final String apiFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator);
-        supportingFiles.add(new SupportingFile("enumsSerializers.mustache", apiFolder, "EnumsSerializers.scala"));
+        additionalProperties.put("mainPackage", mainPackage);
 
         importMapping.remove("Seq");
         importMapping.remove("List");
@@ -142,10 +116,39 @@ public class ScalaAkkaClientCodegen extends AbstractScalaCodegen implements Code
         typeMapping.put("double", "Double");
         typeMapping.put("object", "Any");
         typeMapping.put("file", "File");
+        typeMapping.put("binary", "File");
         typeMapping.put("number", "Double");
 
         instantiationTypes.put("array", "ListBuffer");
         instantiationTypes.put("map", "Map");
+
+        cliOptions.add(new CliOption("mainPackage", "Top-level package name, which defines 'apiPackage', 'modelPackage', 'invokerPackage'").defaultValue("org.openapitools.client"));
+    }
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+        if (additionalProperties.containsKey("mainPackage")) {
+            setMainPackage((String) additionalProperties.get("mainPackage"));
+            apiPackage = mainPackage + ".api";
+            modelPackage = mainPackage + ".model";
+            invokerPackage = mainPackage + ".core";
+            additionalProperties.put("apiPackage", apiPackage);
+            additionalProperties.put("modelPackage", apiPackage);
+            additionalProperties.put("invokerPackage", apiPackage);
+        }
+
+        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
+        supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
+        supportingFiles.add(new SupportingFile("build.sbt.mustache", "", "build.sbt"));
+        supportingFiles.add(new SupportingFile("reference.mustache", resourcesFolder, "reference.conf"));
+        final String invokerFolder = (sourceFolder + File.separator + invokerPackage).replace(".", File.separator);
+        supportingFiles.add(new SupportingFile("apiRequest.mustache", invokerFolder, "ApiRequest.scala"));
+        supportingFiles.add(new SupportingFile("apiInvoker.mustache", invokerFolder, "ApiInvoker.scala"));
+        supportingFiles.add(new SupportingFile("requests.mustache", invokerFolder, "requests.scala"));
+        supportingFiles.add(new SupportingFile("apiSettings.mustache", invokerFolder, "ApiSettings.scala"));
+        final String apiFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator);
+        supportingFiles.add(new SupportingFile("enumsSerializers.mustache", apiFolder, "EnumsSerializers.scala"));
     }
 
     @Override
@@ -348,4 +351,8 @@ public class ScalaAkkaClientCodegen extends AbstractScalaCodegen implements Code
         // remove " to avoid code injection
         return input.replace("\"", "");
     }
+
+    public void setMainPackage(String mainPackage) {
+        this.mainPackage = mainPackage;
+    }
 }
diff --git a/modules/openapi-generator/src/main/resources/akka-scala/api.mustache b/modules/openapi-generator/src/main/resources/akka-scala/api.mustache
index 7c60ac4d68e..f0aa718d9b2 100644
--- a/modules/openapi-generator/src/main/resources/akka-scala/api.mustache
+++ b/modules/openapi-generator/src/main/resources/akka-scala/api.mustache
@@ -4,9 +4,9 @@ package {{package}}
 {{#imports}}
 import {{import}}
 {{/imports}}
-import {{invokerPackage}}._
-import {{invokerPackage}}.CollectionFormats._
-import {{invokerPackage}}.ApiKeyLocations._
+import {{mainPackage}}.core._
+import {{mainPackage}}.core.CollectionFormats._
+import {{mainPackage}}.core.ApiKeyLocations._
 
 {{#operations}}
 object {{classname}} {
diff --git a/modules/openapi-generator/src/main/resources/akka-scala/apiInvoker.mustache b/modules/openapi-generator/src/main/resources/akka-scala/apiInvoker.mustache
index 82ed4ced156..a090e9c8539 100644
--- a/modules/openapi-generator/src/main/resources/akka-scala/apiInvoker.mustache
+++ b/modules/openapi-generator/src/main/resources/akka-scala/apiInvoker.mustache
@@ -1,5 +1,5 @@
 {{>licenseInfo}}
-package {{invokerPackage}}
+package {{{mainPackage}}}.core
 
 import java.io.File
 import java.security.cert.X509Certificate
@@ -89,8 +89,8 @@ object ApiInvoker {
 
 class ApiInvoker(formats: Formats)(implicit system: ActorSystem) extends UntrustedSslContext with CustomContentTypes {
 
-  import io.swagger.client.core.ApiInvoker._
-  import io.swagger.client.core.ParametersMap._
+  import {{mainPackage}}.core.ApiInvoker._
+  import {{mainPackage}}.core.ParametersMap._
 
   implicit val ec: ExecutionContextExecutor = system.dispatcher
   implicit val jsonFormats: Formats = formats
diff --git a/modules/openapi-generator/src/main/resources/akka-scala/apiRequest.mustache b/modules/openapi-generator/src/main/resources/akka-scala/apiRequest.mustache
index fd2ba29ea0b..deb0845fe9a 100644
--- a/modules/openapi-generator/src/main/resources/akka-scala/apiRequest.mustache
+++ b/modules/openapi-generator/src/main/resources/akka-scala/apiRequest.mustache
@@ -1,5 +1,5 @@
 {{>licenseInfo}}
-package {{invokerPackage}}
+package {{{mainPackage}}}.core
 
 sealed trait ResponseState
 
diff --git a/modules/openapi-generator/src/main/resources/akka-scala/apiSettings.mustache b/modules/openapi-generator/src/main/resources/akka-scala/apiSettings.mustache
index ad0e9851cb9..3adce134778 100644
--- a/modules/openapi-generator/src/main/resources/akka-scala/apiSettings.mustache
+++ b/modules/openapi-generator/src/main/resources/akka-scala/apiSettings.mustache
@@ -1,11 +1,11 @@
 {{>licenseInfo}}
-package {{invokerPackage}}
+package {{{mainPackage}}}.core
 
 import java.util.concurrent.TimeUnit
 
 import akka.actor.{ExtendedActorSystem, Extension, ExtensionKey}
 import com.typesafe.config.Config
-import io.swagger.client.core.ApiInvoker.CustomStatusCode
+import {{mainPackage}}.core.ApiInvoker.CustomStatusCode
 import spray.http.HttpHeaders.RawHeader
 
 import scala.collection.JavaConversions._
@@ -14,7 +14,7 @@ import scala.concurrent.duration.FiniteDuration
 class ApiSettings(config: Config) extends Extension {
   def this(system: ExtendedActorSystem) = this(system.settings.config)
 
-  private def cfg = config.getConfig("io.swagger.client.apiRequest")
+  private def cfg = config.getConfig("{{mainPackage}}.apiRequest")
 
   val alwaysTrustCertificates: Boolean = cfg.getBoolean("trust-certificates")
   val defaultHeaders: List[RawHeader] = cfg.getConfig("default-headers").entrySet.toList.map(c => RawHeader(c.getKey, c.getValue.render))
diff --git a/modules/openapi-generator/src/main/resources/akka-scala/model.mustache b/modules/openapi-generator/src/main/resources/akka-scala/model.mustache
index 9ab495126a7..9cede89f07b 100644
--- a/modules/openapi-generator/src/main/resources/akka-scala/model.mustache
+++ b/modules/openapi-generator/src/main/resources/akka-scala/model.mustache
@@ -1,7 +1,7 @@
 {{>licenseInfo}}
 package {{package}}
 
-import {{invokerPackage}}.ApiModel
+import {{mainPackage}}.core.ApiModel
 import org.joda.time.DateTime
 import java.util.UUID
 
diff --git a/modules/openapi-generator/src/main/resources/akka-scala/requests.mustache b/modules/openapi-generator/src/main/resources/akka-scala/requests.mustache
index d395664a8b6..3f7e58056cb 100644
--- a/modules/openapi-generator/src/main/resources/akka-scala/requests.mustache
+++ b/modules/openapi-generator/src/main/resources/akka-scala/requests.mustache
@@ -1,5 +1,5 @@
 {{>licenseInfo}}
-package {{invokerPackage}}
+package {{mainPackage}}.core
 
 import java.io.File
 import java.net.URLEncoder
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/ScalaAkkaClientOptionsProvider.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/ScalaAkkaClientOptionsProvider.java
index c3dd02ee720..cb18b4ca111 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/ScalaAkkaClientOptionsProvider.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/ScalaAkkaClientOptionsProvider.java
@@ -32,6 +32,8 @@ public class ScalaAkkaClientOptionsProvider implements OptionsProvider {
     public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true";
     public static final String ALLOW_UNICODE_IDENTIFIERS_VALUE = "false";
     public static final String PREPEND_FORM_OR_BODY_PARAMETERS_VALUE = "true";
+    public static final String MAIN_PACKAGE_VALUE = "net.test";
+
 
     @Override
     public String getLanguage() {
@@ -48,6 +50,7 @@ public class ScalaAkkaClientOptionsProvider implements OptionsProvider {
                 .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE)
                 .put(CodegenConstants.ALLOW_UNICODE_IDENTIFIERS, ALLOW_UNICODE_IDENTIFIERS_VALUE)
                 .put(CodegenConstants.PREPEND_FORM_OR_BODY_PARAMETERS, PREPEND_FORM_OR_BODY_PARAMETERS_VALUE)
+                .put("mainPackage", MAIN_PACKAGE_VALUE)
                 .build();
     }
 
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalaakka/ScalaAkkaClientOptionsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalaakka/ScalaAkkaClientOptionsTest.java
index 54b2341430b..27d722fa10b 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalaakka/ScalaAkkaClientOptionsTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalaakka/ScalaAkkaClientOptionsTest.java
@@ -53,6 +53,8 @@ public class ScalaAkkaClientOptionsTest extends AbstractOptionsTest {
             times = 1;
             clientCodegen.setPrependFormOrBodyParameters(Boolean.valueOf(ScalaAkkaClientOptionsProvider.PREPEND_FORM_OR_BODY_PARAMETERS_VALUE));
             times = 1;
+            clientCodegen.setMainPackage(ScalaAkkaClientOptionsProvider.MAIN_PACKAGE_VALUE);
+            times = 1;
         }};
     }
 }
diff --git a/samples/client/petstore/akka-scala/README.md b/samples/client/petstore/akka-scala/README.md
index 0fe4343bb61..a1ab296dc4d 100644
--- a/samples/client/petstore/akka-scala/README.md
+++ b/samples/client/petstore/akka-scala/README.md
@@ -36,7 +36,7 @@ Add this dependency to your project's POM:
 
 ```xml
 <dependency>
-  <groupId>io.swagger</groupId>
+  <groupId>org.openapitools</groupId>
   <artifactId>scala-akka-petstore-client</artifactId>
   <version>1.0.0</version>
   <scope>compile</scope>
@@ -48,13 +48,13 @@ Add this dependency to your project's POM:
 Add this dependency to your project's build file:
 
 ```groovy
-compile "io.swagger:scala-akka-petstore-client:1.0.0"
+compile "org.openapitools:scala-akka-petstore-client:1.0.0"
 ```
 
 ### SBT users
 
 ```scala
-libraryDependencies += "io.swagger" % "scala-akka-petstore-client" % "1.0.0"
+libraryDependencies += "org.openapitools" % "scala-akka-petstore-client" % "1.0.0"
 ```
 
 ## Getting Started
diff --git a/samples/client/petstore/akka-scala/build.sbt b/samples/client/petstore/akka-scala/build.sbt
index de6f172c1f4..8574db359f4 100644
--- a/samples/client/petstore/akka-scala/build.sbt
+++ b/samples/client/petstore/akka-scala/build.sbt
@@ -1,6 +1,6 @@
 version := "1.0.0"
 name := "scala-akka-petstore-client"
-organization := "io.swagger"
+organization := "org.openapitools"
 scalaVersion := "2.11.12"
 
 libraryDependencies ++= Seq(
diff --git a/samples/client/petstore/akka-scala/pom.xml b/samples/client/petstore/akka-scala/pom.xml
index fcd419565d5..264dad8d1a5 100644
--- a/samples/client/petstore/akka-scala/pom.xml
+++ b/samples/client/petstore/akka-scala/pom.xml
@@ -4,7 +4,7 @@
 
   <name>scala-akka-petstore-client</name>
 
-  <groupId>io.swagger</groupId>
+  <groupId>org.openapitools</groupId>
   <artifactId>scala-akka-petstore-client</artifactId>
   <version>1.0.0</version>
 
diff --git a/samples/client/petstore/akka-scala/src/main/resources/reference.conf b/samples/client/petstore/akka-scala/src/main/resources/reference.conf
index eefb864852e..6d419f988eb 100644
--- a/samples/client/petstore/akka-scala/src/main/resources/reference.conf
+++ b/samples/client/petstore/akka-scala/src/main/resources/reference.conf
@@ -1,4 +1,4 @@
-io.swagger.client {
+org.openapitools.client {
 
     apiRequest {
 
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/EnumsSerializers.scala b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/api/EnumsSerializers.scala
similarity index 95%
rename from samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/EnumsSerializers.scala
rename to samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/api/EnumsSerializers.scala
index c953d1bc072..85cc57e381b 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/EnumsSerializers.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/api/EnumsSerializers.scala
@@ -9,9 +9,9 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package io.swagger.client.api
+package org.openapitools.client.api
 
-import io.swagger.client.model._
+import org.openapitools.client.model._
 import org.json4s._
 import scala.reflect.ClassTag
 
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/PetApi.scala b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/api/PetApi.scala
similarity index 94%
rename from samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/PetApi.scala
rename to samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/api/PetApi.scala
index c67a2149e35..48ceadfe528 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/PetApi.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/api/PetApi.scala
@@ -9,14 +9,14 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package io.swagger.client.api
+package org.openapitools.client.api
 
-import io.swagger.client.model.ApiResponse
+import org.openapitools.client.model.ApiResponse
 import java.io.File
-import io.swagger.client.model.Pet
-import io.swagger.client.core._
-import io.swagger.client.core.CollectionFormats._
-import io.swagger.client.core.ApiKeyLocations._
+import org.openapitools.client.model.Pet
+import org.openapitools.client.core._
+import org.openapitools.client.core.CollectionFormats._
+import org.openapitools.client.core.ApiKeyLocations._
 
 object PetApi {
 
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/StoreApi.scala b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/api/StoreApi.scala
similarity index 91%
rename from samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/StoreApi.scala
rename to samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/api/StoreApi.scala
index 57507786e39..25751afbb21 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/StoreApi.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/api/StoreApi.scala
@@ -9,12 +9,12 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package io.swagger.client.api
+package org.openapitools.client.api
 
-import io.swagger.client.model.Order
-import io.swagger.client.core._
-import io.swagger.client.core.CollectionFormats._
-import io.swagger.client.core.ApiKeyLocations._
+import org.openapitools.client.model.Order
+import org.openapitools.client.core._
+import org.openapitools.client.core.CollectionFormats._
+import org.openapitools.client.core.ApiKeyLocations._
 
 object StoreApi {
 
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/UserApi.scala b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/api/UserApi.scala
similarity index 95%
rename from samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/UserApi.scala
rename to samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/api/UserApi.scala
index c46136a43f7..c439b7b188b 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/UserApi.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/api/UserApi.scala
@@ -9,12 +9,12 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package io.swagger.client.api
+package org.openapitools.client.api
 
-import io.swagger.client.model.User
-import io.swagger.client.core._
-import io.swagger.client.core.CollectionFormats._
-import io.swagger.client.core.ApiKeyLocations._
+import org.openapitools.client.model.User
+import org.openapitools.client.core._
+import org.openapitools.client.core.CollectionFormats._
+import org.openapitools.client.core.ApiKeyLocations._
 
 object UserApi {
 
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiInvoker.scala b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/core/ApiInvoker.scala
similarity index 98%
rename from samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiInvoker.scala
rename to samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/core/ApiInvoker.scala
index 79afec3a264..55b7877b63a 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiInvoker.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/core/ApiInvoker.scala
@@ -9,7 +9,7 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package io.swagger.client.core
+package org.openapitools.client.core
 
 import java.io.File
 import java.security.cert.X509Certificate
@@ -99,8 +99,8 @@ object ApiInvoker {
 
 class ApiInvoker(formats: Formats)(implicit system: ActorSystem) extends UntrustedSslContext with CustomContentTypes {
 
-  import io.swagger.client.core.ApiInvoker._
-  import io.swagger.client.core.ParametersMap._
+  import org.openapitools.client.core.ApiInvoker._
+  import org.openapitools.client.core.ParametersMap._
 
   implicit val ec: ExecutionContextExecutor = system.dispatcher
   implicit val jsonFormats: Formats = formats
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiRequest.scala b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/core/ApiRequest.scala
similarity index 98%
rename from samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiRequest.scala
rename to samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/core/ApiRequest.scala
index 86eb1aecc2a..2378d8c5fe0 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiRequest.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/core/ApiRequest.scala
@@ -9,7 +9,7 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package io.swagger.client.core
+package org.openapitools.client.core
 
 sealed trait ResponseState
 
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiSettings.scala b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/core/ApiSettings.scala
similarity index 89%
rename from samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiSettings.scala
rename to samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/core/ApiSettings.scala
index e3777fe4b0f..a8aadcd7432 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/ApiSettings.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/core/ApiSettings.scala
@@ -9,13 +9,13 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package io.swagger.client.core
+package org.openapitools.client.core
 
 import java.util.concurrent.TimeUnit
 
 import akka.actor.{ExtendedActorSystem, Extension, ExtensionKey}
 import com.typesafe.config.Config
-import io.swagger.client.core.ApiInvoker.CustomStatusCode
+import org.openapitools.client.core.ApiInvoker.CustomStatusCode
 import spray.http.HttpHeaders.RawHeader
 
 import scala.collection.JavaConversions._
@@ -24,7 +24,7 @@ import scala.concurrent.duration.FiniteDuration
 class ApiSettings(config: Config) extends Extension {
   def this(system: ExtendedActorSystem) = this(system.settings.config)
 
-  private def cfg = config.getConfig("io.swagger.client.apiRequest")
+  private def cfg = config.getConfig("org.openapitools.client.apiRequest")
 
   val alwaysTrustCertificates: Boolean = cfg.getBoolean("trust-certificates")
   val defaultHeaders: List[RawHeader] = cfg.getConfig("default-headers").entrySet.toList.map(c => RawHeader(c.getKey, c.getValue.render))
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/requests.scala b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/core/requests.scala
similarity index 99%
rename from samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/requests.scala
rename to samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/core/requests.scala
index 1722b9eacf5..ff715e3eb29 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/core/requests.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/core/requests.scala
@@ -9,7 +9,7 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package io.swagger.client.core
+package org.openapitools.client.core
 
 import java.io.File
 import java.net.URLEncoder
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/ApiResponse.scala b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/model/ApiResponse.scala
similarity index 86%
rename from samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/ApiResponse.scala
rename to samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/model/ApiResponse.scala
index df055ebc117..ce8e3b4942b 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/ApiResponse.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/model/ApiResponse.scala
@@ -9,9 +9,9 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package io.swagger.client.model
+package org.openapitools.client.model
 
-import io.swagger.client.core.ApiModel
+import org.openapitools.client.core.ApiModel
 import org.joda.time.DateTime
 import java.util.UUID
 
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Category.scala b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/model/Category.scala
similarity index 85%
rename from samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Category.scala
rename to samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/model/Category.scala
index 0821019e9e0..84a70a3cf6b 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Category.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/model/Category.scala
@@ -9,9 +9,9 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package io.swagger.client.model
+package org.openapitools.client.model
 
-import io.swagger.client.core.ApiModel
+import org.openapitools.client.core.ApiModel
 import org.joda.time.DateTime
 import java.util.UUID
 
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Order.scala b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/model/Order.scala
similarity index 91%
rename from samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Order.scala
rename to samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/model/Order.scala
index 8a06f87b26b..6094089b493 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Order.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/model/Order.scala
@@ -9,9 +9,9 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package io.swagger.client.model
+package org.openapitools.client.model
 
-import io.swagger.client.core.ApiModel
+import org.openapitools.client.core.ApiModel
 import org.joda.time.DateTime
 import java.util.UUID
 
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Pet.scala b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/model/Pet.scala
similarity index 90%
rename from samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Pet.scala
rename to samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/model/Pet.scala
index 1ebc004b1cd..6d4918a776a 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Pet.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/model/Pet.scala
@@ -9,9 +9,9 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package io.swagger.client.model
+package org.openapitools.client.model
 
-import io.swagger.client.core.ApiModel
+import org.openapitools.client.core.ApiModel
 import org.joda.time.DateTime
 import java.util.UUID
 
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Tag.scala b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/model/Tag.scala
similarity index 85%
rename from samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Tag.scala
rename to samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/model/Tag.scala
index a547ec0d9e7..5ed6d6ab614 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/Tag.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/model/Tag.scala
@@ -9,9 +9,9 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package io.swagger.client.model
+package org.openapitools.client.model
 
-import io.swagger.client.core.ApiModel
+import org.openapitools.client.core.ApiModel
 import org.joda.time.DateTime
 import java.util.UUID
 
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/User.scala b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/model/User.scala
similarity index 89%
rename from samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/User.scala
rename to samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/model/User.scala
index 1d2382600cd..facd053fa45 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/model/User.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/org/openapitools/client/model/User.scala
@@ -9,9 +9,9 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-package io.swagger.client.model
+package org.openapitools.client.model
 
-import io.swagger.client.core.ApiModel
+import org.openapitools.client.core.ApiModel
 import org.joda.time.DateTime
 import java.util.UUID