diff --git a/build.sbt b/build.sbt
index 0c2599edde7d..585f7321878d 100644
--- a/build.sbt
+++ b/build.sbt
@@ -5,7 +5,7 @@ organization := "com.wordnik"
 
 name := "swagger-codegen"
 
-version := "2.0.14"
+version := "2.0.16"
 
 scalaVersion := "2.10.0"
 
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 653d01424afd..63ff524f5623 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,3 +1,3 @@
-addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8")
+addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.2")
 
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.9.1")
diff --git a/src/main/resources/flash/build.xml b/src/main/resources/flash/build.xml
index 58c487d23644..6861dd464ece 100644
--- a/src/main/resources/flash/build.xml
+++ b/src/main/resources/flash/build.xml
@@ -63,7 +63,7 @@
             <arg line="-source-path ${sourcepath}"/>
             <arg line="-footer 'Copyright Wordnik'"/>
             <arg line="-package com.wordnik.swagger.api 'Contains the apis which are used by clients to make calls to the services deployed'"/>
-            <arg line="-package com.wordnik.swagger.model 'Contains common classes which encapsulate data elements required'"/>
+            <arg line="-package com.wordnik.swagger.codegen.model 'Contains common classes which encapsulate data elements required'"/>
             <arg line="-package com.wordnik.swagger.common 'Contains classes which are used by the api classes to invoke the deployed api like SwaggerApi - a base class, ApiUserCredentials, etc.'"/>
             <arg line="-package com.wordnik.swagger.event 'Results of calls made to Wordnik are returned via dispatched events. This package contains such event classes. Right now thats just ApiClientEvent and Response.'"/>
             <arg line="-package com.wordnik.swagger.exception 'Contains classes that encapsulate the errors generated'"/>
diff --git a/src/main/scala/com/wordnik/swagger/codegen/BasicAndroidJavaClient.scala b/src/main/scala/com/wordnik/swagger/codegen/BasicAndroidJavaClient.scala
index 111e0b7d8966..5dae2dbcccab 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicAndroidJavaClient.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicAndroidJavaClient.scala
@@ -18,7 +18,7 @@ package com.wordnik.swagger.codegen
 
 import com.wordnik.swagger.codegen.BasicJavaGenerator
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 object BasicAndroidJavaClient extends BasicAndroidJavaGenerator {
   def main(args: Array[String]) = generateClient(args)
@@ -53,10 +53,10 @@ class BasicAndroidJavaGenerator extends BasicJavaGenerator {
   override def destinationDir = "generated-code/android-java/src/main/java"
 
   // package for models
-  override def modelPackage = Some("com.wordnik.client.model")
+  override def modelPackage: Option[String] = Some("com.wordnik.client.model")
 
   // package for api classes
-  override def apiPackage = Some("com.wordnik.client.api")
+  override def apiPackage: Option[String] = Some("com.wordnik.client.api")
 
   /**
    * you should override these params for generating the pom.xml and processing
diff --git a/src/main/scala/com/wordnik/swagger/codegen/BasicCSharpGenerator.scala b/src/main/scala/com/wordnik/swagger/codegen/BasicCSharpGenerator.scala
index 9454ab84c13a..680a934d590b 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicCSharpGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicCSharpGenerator.scala
@@ -16,7 +16,7 @@
 
 package com.wordnik.swagger.codegen
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 object BasicCSharpGenerator extends BasicCSharpGenerator {
   def main(args: Array[String]) = generateClient(args)
@@ -79,10 +79,10 @@ class BasicCSharpGenerator extends BasicGenerator {
   override def importMapping = Map()
 
   // package for models
-  override def modelPackage = Some("Com.Wordnik.Client.Model")
+  override def modelPackage: Option[String] = Some("Com.Wordnik.Client.Model")
 
   // package for api classes
-  override def apiPackage = Some("Com.Wordnik.Client.Api")
+  override def apiPackage: Option[String] = Some("Com.Wordnik.Client.Api")
 
   // file suffix
   override def fileSuffix = ".cs"
diff --git a/src/main/scala/com/wordnik/swagger/codegen/BasicFlashCodegen.scala b/src/main/scala/com/wordnik/swagger/codegen/BasicFlashCodegen.scala
index ee3f84af32de..bbd1a95b88a0 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicFlashCodegen.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicFlashCodegen.scala
@@ -16,7 +16,7 @@
 
 package com.wordnik.swagger.codegen
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 abstract class BasicFlashCodegen extends BasicGenerator {
   override def defaultIncludes = Set(
@@ -53,10 +53,10 @@ abstract class BasicFlashCodegen extends BasicGenerator {
 
 
   // package for models
-  override def modelPackage = Some("com.wordnik.client.model")
+  override def modelPackage: Option[String] = Some("com.wordnik.client.model")
 
   // package for api classes
-  override def apiPackage = Some("com.wordnik.client.api")
+  override def apiPackage: Option[String] = Some("com.wordnik.client.api")
 
   // file suffix
   override def fileSuffix = ".as"
diff --git a/src/main/scala/com/wordnik/swagger/codegen/BasicGenerator.scala b/src/main/scala/com/wordnik/swagger/codegen/BasicGenerator.scala
index 87f190653908..77774d2adff4 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicGenerator.scala
@@ -20,8 +20,8 @@ import com.wordnik.swagger.codegen._
 import com.wordnik.swagger.codegen.util._
 import com.wordnik.swagger.codegen.language.CodegenConfig
 import com.wordnik.swagger.codegen.spec.SwaggerSpecValidator
-import com.wordnik.swagger.model._
-import com.wordnik.swagger.model.SwaggerSerializers
+import com.wordnik.swagger.codegen.model._
+import com.wordnik.swagger.codegen.model.SwaggerSerializers
 import com.wordnik.swagger.codegen.spec.ValidationMessage
 
 import java.io.{ File, FileWriter }
diff --git a/src/main/scala/com/wordnik/swagger/codegen/BasicGroovyGenerator.scala b/src/main/scala/com/wordnik/swagger/codegen/BasicGroovyGenerator.scala
index 4f0ed28f51d6..79aa70ec223d 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicGroovyGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicGroovyGenerator.scala
@@ -38,10 +38,10 @@ class BasicGroovyGenerator extends BasicJavaGenerator {
 
 
   // package for models
-  override def modelPackage = Some("com.wordnik.client.model")
+  override def modelPackage: Option[String] = Some("com.wordnik.client.model")
 
   // package for api classes
-  override def apiPackage = Some("com.wordnik.client.api")
+  override def apiPackage: Option[String] = Some("com.wordnik.client.api")
 
   // file suffix
   override def fileSuffix = ".groovy"
diff --git a/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala b/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala
index 9f707df2a833..4737be546e3d 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala
@@ -16,7 +16,7 @@
 
 package com.wordnik.swagger.codegen
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 object BasicJavaGenerator extends BasicJavaGenerator {
   def main(args: Array[String]) = generateClient(args)
@@ -94,10 +94,10 @@ class BasicJavaGenerator extends BasicGenerator {
   )
 
   // package for models
-  override def modelPackage = Some("com.wordnik.client.model")
+  override def modelPackage: Option[String] = Some("com.wordnik.client.model")
 
   // package for api classes
-  override def apiPackage = Some("com.wordnik.client.api")
+  override def apiPackage: Option[String] = Some("com.wordnik.client.api")
 
   // file suffix
   override def fileSuffix = ".java"
diff --git a/src/main/scala/com/wordnik/swagger/codegen/BasicObjcGenerator.scala b/src/main/scala/com/wordnik/swagger/codegen/BasicObjcGenerator.scala
index 4dec4c0ec164..5ff0135c50bd 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicObjcGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicObjcGenerator.scala
@@ -16,7 +16,7 @@
 
 package com.wordnik.swagger.codegen
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 object BasicObjcGenerator extends BasicObjcGenerator {
   def main(args: Array[String]) = generateClient(args)
diff --git a/src/main/scala/com/wordnik/swagger/codegen/BasicPHPGenerator.scala b/src/main/scala/com/wordnik/swagger/codegen/BasicPHPGenerator.scala
index 34af8caf9778..0af7d5e20677 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicPHPGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicPHPGenerator.scala
@@ -16,7 +16,7 @@
 
 package com.wordnik.swagger.codegen
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 import java.io.File
 
@@ -38,10 +38,10 @@ class BasicPHPGenerator extends BasicGenerator {
   override def destinationDir = "generated-code/php"
 
   // package for models
-  override def modelPackage = Some("models")
+  override def modelPackage: Option[String] = Some("models")
 
   // package for apis
-  override def apiPackage = Some("")
+  override def apiPackage: Option[String] = Some("")
 
   // file suffix
   override def fileSuffix = ".php"
diff --git a/src/main/scala/com/wordnik/swagger/codegen/BasicPythonGenerator.scala b/src/main/scala/com/wordnik/swagger/codegen/BasicPythonGenerator.scala
index 638a4e388ee1..3911b7dc12ca 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicPythonGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicPythonGenerator.scala
@@ -16,7 +16,7 @@
 
 package com.wordnik.swagger.codegen
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 import java.io.File
 
@@ -38,7 +38,7 @@ class BasicPythonGenerator extends BasicGenerator {
   override def destinationDir = "generated-code/python"
 
   // package for models
-  override def modelPackage = Some("models")
+  override def modelPackage: Option[String] = Some("models")
 
   // package for apis
   override def apiPackage = None
diff --git a/src/main/scala/com/wordnik/swagger/codegen/BasicRubyGenerator.scala b/src/main/scala/com/wordnik/swagger/codegen/BasicRubyGenerator.scala
index 0c7441f32163..5d111c30a942 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicRubyGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicRubyGenerator.scala
@@ -16,7 +16,7 @@
 
 package com.wordnik.swagger.codegen
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 import java.io.File
 
@@ -26,7 +26,7 @@ object BasicRubyGenerator extends BasicRubyGenerator {
 
 class BasicRubyGenerator extends BasicGenerator {
 
-  override def apiPackage = Some("lib")
+  override def apiPackage: Option[String] = Some("lib")
 
   // location of templates
   override def templateDir = "ruby"
@@ -44,7 +44,7 @@ class BasicRubyGenerator extends BasicGenerator {
   override def fileSuffix = ".rb"
 
   // package for models
-  override def modelPackage = Some("models")
+  override def modelPackage: Option[String] = Some("models")
 
   // response classes
   override def processResponseClass(responseClass: String): Option[String] = {
diff --git a/src/main/scala/com/wordnik/swagger/codegen/BasicScalaGenerator.scala b/src/main/scala/com/wordnik/swagger/codegen/BasicScalaGenerator.scala
index e60ff2f0dfd2..12d72ff19d4d 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicScalaGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicScalaGenerator.scala
@@ -16,7 +16,7 @@
 
 package com.wordnik.swagger.codegen
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 object BasicScalaGenerator extends BasicScalaGenerator {
   def main(args: Array[String]) = generateClient(args)
@@ -114,10 +114,10 @@ class BasicScalaGenerator extends BasicGenerator {
   )
 
   // package for models
-  override def modelPackage = Some("com.wordnik.client.model")
+  override def modelPackage: Option[String] = Some("com.wordnik.client.model")
 
   // package for api classes
-  override def apiPackage = Some("com.wordnik.client.api")
+  override def apiPackage: Option[String] = Some("com.wordnik.client.api")
 
   // response classes--if you don't want a response class, override and set to None
   override def processResponseClass(responseClass: String): Option[String] = {
diff --git a/src/main/scala/com/wordnik/swagger/codegen/Codegen.scala b/src/main/scala/com/wordnik/swagger/codegen/Codegen.scala
index 3aa72cbe975e..fd94198d5f65 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/Codegen.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/Codegen.scala
@@ -16,7 +16,7 @@
 
 package com.wordnik.swagger.codegen
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import com.wordnik.swagger.codegen.util.CoreUtils
 import com.wordnik.swagger.codegen.language.CodegenConfig
 import com.wordnik.swagger.codegen.spec.SwaggerSpec._
diff --git a/src/main/scala/com/wordnik/swagger/codegen/ScalaAsyncClientGenerator.scala b/src/main/scala/com/wordnik/swagger/codegen/ScalaAsyncClientGenerator.scala
index 5ae7574ad76e..45bc91cf9003 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/ScalaAsyncClientGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/ScalaAsyncClientGenerator.scala
@@ -2,7 +2,7 @@ package com.wordnik.swagger.codegen
 
 import scala.collection.mutable
 import java.io.{File, FileWriter}
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import scala.collection.mutable.{HashMap, ListBuffer}
 import language.CodegenConfig
 import scala.io.Source
diff --git a/src/main/scala/com/wordnik/swagger/codegen/SpecConverter.scala b/src/main/scala/com/wordnik/swagger/codegen/SpecConverter.scala
index 3893b5011208..8c69aca47e69 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/SpecConverter.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/SpecConverter.scala
@@ -1,7 +1,7 @@
 package com.wordnik.swagger.codegen
 
 import com.wordnik.swagger.codegen.util.{ ResourceExtractor, ApiExtractor }
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 import java.io.File
 
diff --git a/src/main/scala/com/wordnik/swagger/codegen/SwaggerDocGenerator.scala b/src/main/scala/com/wordnik/swagger/codegen/SwaggerDocGenerator.scala
index 33cbb8fb492f..ea9ce92454ff 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/SwaggerDocGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/SwaggerDocGenerator.scala
@@ -16,7 +16,7 @@
 
 import com.wordnik.swagger.codegen.BasicGenerator
 import com.wordnik.swagger.codegen.spec.SwaggerSpec
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 import scala.collection.mutable.{ HashMap, ListBuffer }
 
@@ -84,10 +84,10 @@ object SwaggerDocGenerator extends BasicGenerator {
   }
 
   // package for models
-  override def modelPackage = Some("models")
+  override def modelPackage: Option[String] = Some("models")
 
   // package for api classes
-  override def apiPackage = Some("operations")
+  override def apiPackage: Option[String] = Some("operations")
 
   override def supportingFiles = List(
     ("pom.xml", outputFolder, "pom.xml"),
diff --git a/src/main/scala/com/wordnik/swagger/codegen/language/CodegenConfig.scala b/src/main/scala/com/wordnik/swagger/codegen/language/CodegenConfig.scala
index 8176b7a69b32..69ff3939b4d5 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/language/CodegenConfig.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/language/CodegenConfig.scala
@@ -16,7 +16,7 @@
 
 package com.wordnik.swagger.codegen.language
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 import scala.collection.mutable.{ HashMap, HashSet }
 
diff --git a/src/main/scala/com/wordnik/swagger/model/AuthorizationModels.scala b/src/main/scala/com/wordnik/swagger/codegen/model/AuthorizationModels.scala
similarity index 97%
rename from src/main/scala/com/wordnik/swagger/model/AuthorizationModels.scala
rename to src/main/scala/com/wordnik/swagger/codegen/model/AuthorizationModels.scala
index 108a34536e97..c2796fb2594a 100644
--- a/src/main/scala/com/wordnik/swagger/model/AuthorizationModels.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/model/AuthorizationModels.scala
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package com.wordnik.swagger.model
+package com.wordnik.swagger.codegen.model
 
 trait AuthorizationType {
   def `type`: String
diff --git a/src/main/scala/com/wordnik/swagger/model/LegacySerializers.scala b/src/main/scala/com/wordnik/swagger/codegen/model/LegacySerializers.scala
similarity index 99%
rename from src/main/scala/com/wordnik/swagger/model/LegacySerializers.scala
rename to src/main/scala/com/wordnik/swagger/codegen/model/LegacySerializers.scala
index a217db0513f9..d36822ee053d 100644
--- a/src/main/scala/com/wordnik/swagger/model/LegacySerializers.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/model/LegacySerializers.scala
@@ -1,6 +1,6 @@
-package com.wordnik.swagger.model.legacy
+package com.wordnik.swagger.codegen.model.legacy
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import com.wordnik.swagger.codegen.spec.ValidationMessage
 
 import org.json4s._
diff --git a/src/main/scala/com/wordnik/swagger/model/SwaggerModelSerializer.scala b/src/main/scala/com/wordnik/swagger/codegen/model/SwaggerModelSerializer.scala
similarity index 99%
rename from src/main/scala/com/wordnik/swagger/model/SwaggerModelSerializer.scala
rename to src/main/scala/com/wordnik/swagger/codegen/model/SwaggerModelSerializer.scala
index 3cf837e9d424..cc4f81c4b2f5 100644
--- a/src/main/scala/com/wordnik/swagger/model/SwaggerModelSerializer.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/model/SwaggerModelSerializer.scala
@@ -1,4 +1,4 @@
-package com.wordnik.swagger.model
+package com.wordnik.swagger.codegen.model
 
 import com.wordnik.swagger.codegen.spec.ValidationMessage
 import legacy.LegacySerializers
diff --git a/src/main/scala/com/wordnik/swagger/model/SwaggerModels.scala b/src/main/scala/com/wordnik/swagger/codegen/model/SwaggerModels.scala
similarity index 98%
rename from src/main/scala/com/wordnik/swagger/model/SwaggerModels.scala
rename to src/main/scala/com/wordnik/swagger/codegen/model/SwaggerModels.scala
index 89aefb884a42..1f6e2c837150 100644
--- a/src/main/scala/com/wordnik/swagger/model/SwaggerModels.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/model/SwaggerModels.scala
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package com.wordnik.swagger.model
+package com.wordnik.swagger.codegen.model
 
 import scala.collection.mutable.LinkedHashMap
 
diff --git a/src/main/scala/com/wordnik/swagger/codegen/spec/SwaggerSpecValidator.scala b/src/main/scala/com/wordnik/swagger/codegen/spec/SwaggerSpecValidator.scala
index d7d218dd4a63..ddfe911526fd 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/spec/SwaggerSpecValidator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/spec/SwaggerSpecValidator.scala
@@ -16,7 +16,7 @@
 
 package com.wordnik.swagger.codegen.spec
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import com.wordnik.swagger.codegen.PathUtil
 import com.wordnik.swagger.codegen.spec.SwaggerSpec._
 import com.wordnik.swagger.codegen.util.CoreUtils
diff --git a/src/main/scala/com/wordnik/swagger/codegen/spec/Validator.scala b/src/main/scala/com/wordnik/swagger/codegen/spec/Validator.scala
index 1a577073ee6d..bf06c241a963 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/spec/Validator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/spec/Validator.scala
@@ -18,7 +18,7 @@ package com.wordnik.swagger.codegen.spec
 
 import com.wordnik.swagger.codegen.util.{CoreUtils, ApiExtractor, ResourceExtractor}
 import com.wordnik.swagger.codegen.PathUtil
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 import scala.collection.JavaConversions._
 
diff --git a/src/main/scala/com/wordnik/swagger/codegen/util/ApiExtractor.scala b/src/main/scala/com/wordnik/swagger/codegen/util/ApiExtractor.scala
index dd120b8036d9..ee08c81b1434 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/util/ApiExtractor.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/util/ApiExtractor.scala
@@ -16,7 +16,7 @@
 
 package com.wordnik.swagger.codegen.util
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 import org.json4s.jackson.JsonMethods._
 import org.json4s.jackson.Serialization.read
diff --git a/src/main/scala/com/wordnik/swagger/codegen/util/CoreUtils.scala b/src/main/scala/com/wordnik/swagger/codegen/util/CoreUtils.scala
index b78b1c3b60e6..e41fed86537d 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/util/CoreUtils.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/util/CoreUtils.scala
@@ -16,7 +16,7 @@
 
 package com.wordnik.swagger.codegen.util
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 import scala.collection.mutable.{ HashSet, ListBuffer, HashMap }
 import scala.collection.JavaConversions._
diff --git a/src/main/scala/com/wordnik/swagger/codegen/util/RemoteUrl.scala b/src/main/scala/com/wordnik/swagger/codegen/util/RemoteUrl.scala
index 826a3ec9f349..51d8dbea5474 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/util/RemoteUrl.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/util/RemoteUrl.scala
@@ -1,6 +1,6 @@
 package com.wordnik.swagger.codegen.util
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 import java.net._
 import java.io.InputStream
diff --git a/src/main/scala/com/wordnik/swagger/codegen/util/ResourceExtractor.scala b/src/main/scala/com/wordnik/swagger/codegen/util/ResourceExtractor.scala
index 616e25251873..f0ade5493ad7 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/util/ResourceExtractor.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/util/ResourceExtractor.scala
@@ -16,7 +16,7 @@
 
 package com.wordnik.swagger.codegen.util
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 import org.json4s._
 import org.json4s.jackson.JsonMethods._
diff --git a/src/test/scala/BasicCSharpGeneratorTest.scala b/src/test/scala/BasicCSharpGeneratorTest.scala
index d29e03985e88..39210e1a69ea 100644
--- a/src/test/scala/BasicCSharpGeneratorTest.scala
+++ b/src/test/scala/BasicCSharpGeneratorTest.scala
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import com.wordnik.swagger.codegen.{BasicCSharpGenerator, PathUtil}
 import com.wordnik.swagger.codegen.util._
 import com.wordnik.swagger.codegen.language._
diff --git a/src/test/scala/BasicGeneratorTest.scala b/src/test/scala/BasicGeneratorTest.scala
index 9712552c5454..3fe4f65a8bb8 100644
--- a/src/test/scala/BasicGeneratorTest.scala
+++ b/src/test/scala/BasicGeneratorTest.scala
@@ -16,7 +16,7 @@
 
 import com.wordnik.swagger.codegen.BasicGenerator
 import com.wordnik.swagger.codegen.util._
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
diff --git a/src/test/scala/BasicJavaGeneratorTest.scala b/src/test/scala/BasicJavaGeneratorTest.scala
index 6f000d5efa44..cabcedbf3783 100644
--- a/src/test/scala/BasicJavaGeneratorTest.scala
+++ b/src/test/scala/BasicJavaGeneratorTest.scala
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import com.wordnik.swagger.codegen.{BasicJavaGenerator, PathUtil}
 import com.wordnik.swagger.codegen.util._
 import com.wordnik.swagger.codegen.language._
diff --git a/src/test/scala/BasicScalaGeneratorTest.scala b/src/test/scala/BasicScalaGeneratorTest.scala
index 97521bba7268..0b35a0375e20 100644
--- a/src/test/scala/BasicScalaGeneratorTest.scala
+++ b/src/test/scala/BasicScalaGeneratorTest.scala
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import com.wordnik.swagger.codegen.{BasicScalaGenerator, Codegen, PathUtil}
 import com.wordnik.swagger.codegen.util._
 import com.wordnik.swagger.codegen.language._
diff --git a/src/test/scala/CodegenConfigTest.scala b/src/test/scala/CodegenConfigTest.scala
index eab97a880e03..8ca365cfe1d1 100644
--- a/src/test/scala/CodegenConfigTest.scala
+++ b/src/test/scala/CodegenConfigTest.scala
@@ -39,7 +39,7 @@ class CodegenConfigTest extends FlatSpec with ShouldMatchers {
     override def escapeReservedWord(word: String) = "`" + word + "`"
     override def typeMapping = Map("int" -> "integer")
     override def invokerPackage = Some("com.wordnik.something")
-    override def apiPackage = Some("com.wordnik.api")
+    override def apiPackage: Option[String] = Some("com.wordnik.api")
     override def modelPackage = Some("com.wordnik.models")
     override def reservedWords = Set("special")
     override def importMapping = super.importMapping ++ Map("User" -> "com.mypackage.User")
diff --git a/src/test/scala/swaggerSpec1_1/CoreUtilsTest.scala b/src/test/scala/swaggerSpec1_1/CoreUtilsTest.scala
index 5b42b8da2dfa..f72609d9362c 100644
--- a/src/test/scala/swaggerSpec1_1/CoreUtilsTest.scala
+++ b/src/test/scala/swaggerSpec1_1/CoreUtilsTest.scala
@@ -2,7 +2,7 @@ package swaggerSpec1_1
 
 import com.wordnik.swagger.codegen.util.CoreUtils
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import com.wordnik.swagger.codegen.util._
 
 import org.junit.runner.RunWith
diff --git a/src/test/scala/swaggerSpec1_1/ModelSerializerValidations.scala b/src/test/scala/swaggerSpec1_1/ModelSerializerValidations.scala
index abfbfb83d556..e19b95acd2eb 100644
--- a/src/test/scala/swaggerSpec1_1/ModelSerializerValidations.scala
+++ b/src/test/scala/swaggerSpec1_1/ModelSerializerValidations.scala
@@ -1,6 +1,6 @@
 package swaggerSpec1_1
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 import org.json4s._
 import org.json4s.JsonDSL._
diff --git a/src/test/scala/swaggerSpec1_1/ModelSerializersTest.scala b/src/test/scala/swaggerSpec1_1/ModelSerializersTest.scala
index 0b6d3b5467b8..4d2ab71e60f0 100644
--- a/src/test/scala/swaggerSpec1_1/ModelSerializersTest.scala
+++ b/src/test/scala/swaggerSpec1_1/ModelSerializersTest.scala
@@ -1,6 +1,6 @@
 package swaggerSpec1_1
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 import org.json4s._
 import org.json4s.JsonDSL._
diff --git a/src/test/scala/swaggerSpec1_1/SwaggerModelTest.scala b/src/test/scala/swaggerSpec1_1/SwaggerModelTest.scala
index f6c45c4a9811..921c79321fa8 100644
--- a/src/test/scala/swaggerSpec1_1/SwaggerModelTest.scala
+++ b/src/test/scala/swaggerSpec1_1/SwaggerModelTest.scala
@@ -15,7 +15,7 @@
  */
 package swaggerSpec1_1
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 import org.json4s.jackson.JsonMethods._
 import org.json4s.jackson.Serialization.read
diff --git a/src/test/scala/swaggerSpec1_1/UtilsTest.scala b/src/test/scala/swaggerSpec1_1/UtilsTest.scala
index b79922bac8dc..dd2f06692e81 100644
--- a/src/test/scala/swaggerSpec1_1/UtilsTest.scala
+++ b/src/test/scala/swaggerSpec1_1/UtilsTest.scala
@@ -15,7 +15,7 @@
  */
 package swaggerSpec1_1
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import com.wordnik.swagger.codegen.util.{ResourceExtractor, ApiExtractor, CoreUtils}
 
 import org.junit.runner.RunWith
diff --git a/src/test/scala/swaggerSpec1_2/CoreUtilsTest.scala b/src/test/scala/swaggerSpec1_2/CoreUtilsTest.scala
index f5dba94c92c1..15d62fec634f 100644
--- a/src/test/scala/swaggerSpec1_2/CoreUtilsTest.scala
+++ b/src/test/scala/swaggerSpec1_2/CoreUtilsTest.scala
@@ -2,7 +2,7 @@ package swaggerSpec1_2
 
 import com.wordnik.swagger.codegen.util.CoreUtils
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import com.wordnik.swagger.codegen.util._
 
 import org.junit.runner.RunWith
diff --git a/src/test/scala/swaggerSpec1_2/ModelSerializerValidations.scala b/src/test/scala/swaggerSpec1_2/ModelSerializerValidations.scala
index aeeecb9bf744..b59c880cbf96 100644
--- a/src/test/scala/swaggerSpec1_2/ModelSerializerValidations.scala
+++ b/src/test/scala/swaggerSpec1_2/ModelSerializerValidations.scala
@@ -1,6 +1,6 @@
 package swaggerSpec1_2
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 import org.json4s._
 import org.json4s.JsonDSL._
diff --git a/src/test/scala/swaggerSpec1_2/ModelSerializersTest.scala b/src/test/scala/swaggerSpec1_2/ModelSerializersTest.scala
index 6a6200a512fb..ce96f94eff36 100644
--- a/src/test/scala/swaggerSpec1_2/ModelSerializersTest.scala
+++ b/src/test/scala/swaggerSpec1_2/ModelSerializersTest.scala
@@ -1,6 +1,6 @@
 package swaggerSpec1_2
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 
 import org.json4s._
 import org.json4s.JsonDSL._
diff --git a/src/test/scala/swaggerSpec1_2/UtilsTest.scala b/src/test/scala/swaggerSpec1_2/UtilsTest.scala
index 7f4874930d3e..483015676127 100644
--- a/src/test/scala/swaggerSpec1_2/UtilsTest.scala
+++ b/src/test/scala/swaggerSpec1_2/UtilsTest.scala
@@ -15,7 +15,7 @@
  */
 package swaggerSpec1_2
 
-import com.wordnik.swagger.model._
+import com.wordnik.swagger.codegen.model._
 import com.wordnik.swagger.codegen.util.{ResourceExtractor, ApiExtractor, CoreUtils}
 
 import org.junit.runner.RunWith