9 files changed, 7 insertions, 38 deletions
diff --git a/async-http-client-handler/src/main/scala/com/softwaremill/sttp/asynchttpclient/AsyncHttpClientHandler.scala b/async-http-client-handler/src/main/scala/com/softwaremill/sttp/asynchttpclient/AsyncHttpClientHandler.scala
index 7b74c29..ea1b720 100644
--- a/async-http-client-handler/src/main/scala/com/softwaremill/sttp/asynchttpclient/AsyncHttpClientHandler.scala
+++ b/async-http-client-handler/src/main/scala/com/softwaremill/sttp/asynchttpclient/AsyncHttpClientHandler.scala
@@ -3,29 +3,11 @@ package com.softwaremill.sttp.asynchttpclient
 import java.nio.ByteBuffer
 import java.nio.charset.Charset
 
-import com.softwaremill.sttp.model.ResponseAs.EagerResponseHandler
-import com.softwaremill.sttp.model._
-import com.softwaremill.sttp.{
-  ContentLengthHeader,
-  MonadAsyncError,
-  MonadError,
-  Request,
-  Response,
-  SttpHandler
-}
+import com.softwaremill.sttp.ResponseAs.EagerResponseHandler
+import com.softwaremill.sttp.{BasicResponseAs, ContentLengthHeader, IgnoreResponse, MonadAsyncError, MonadError, NoBody, Request, RequestBody, Response, ResponseAs, ResponseAsByteArray, ResponseAsStream, SttpHandler}
 import org.asynchttpclient.AsyncHandler.State
 import org.asynchttpclient.handler.StreamedAsyncHandler
-import org.asynchttpclient.{
-  AsyncCompletionHandler,
-  AsyncHandler,
-  AsyncHttpClient,
-  HttpResponseBodyPart,
-  HttpResponseHeaders,
-  HttpResponseStatus,
-  RequestBuilder,
-  Request => AsyncRequest,
-  Response => AsyncResponse
-}
+import org.asynchttpclient.{AsyncCompletionHandler, AsyncHandler, AsyncHttpClient, HttpResponseBodyPart, HttpResponseHeaders, HttpResponseStatus, RequestBuilder, Request => AsyncRequest, Response => AsyncResponse}
 import org.reactivestreams.{Publisher, Subscriber, Subscription}
 
 import scala.collection.JavaConverters._
diff --git a/core/src/main/scala/com/softwaremill/sttp/HttpURLConnectionSttpHandler.scala b/core/src/main/scala/com/softwaremill/sttp/HttpURLConnectionSttpHandler.scala
index dd208f4..2fdce76 100644
--- a/core/src/main/scala/com/softwaremill/sttp/HttpURLConnectionSttpHandler.scala
+++ b/core/src/main/scala/com/softwaremill/sttp/HttpURLConnectionSttpHandler.scala
@@ -7,8 +7,6 @@ import java.nio.charset.CharacterCodingException
 import java.nio.file.Files
 import java.util.zip.{GZIPInputStream, InflaterInputStream}
 
-import com.softwaremill.sttp.model._
-
 import scala.annotation.tailrec
 import scala.io.Source
 import scala.collection.JavaConverters._
diff --git a/core/src/main/scala/com/softwaremill/sttp/model/Method.scala b/core/src/main/scala/com/softwaremill/sttp/Method.scala
index 6f2ea68..83b2c05 100644
--- a/core/src/main/scala/com/softwaremill/sttp/model/Method.scala
+++ b/core/src/main/scala/com/softwaremill/sttp/Method.scala
@@ -1,4 +1,4 @@
-package com.softwaremill.sttp.model
+package com.softwaremill.sttp
 
 case class Method(m: String) extends AnyVal
 object Method {
diff --git a/core/src/main/scala/com/softwaremill/sttp/Multipart.scala b/core/src/main/scala/com/softwaremill/sttp/Multipart.scala
index c54c615..86a4494 100644
--- a/core/src/main/scala/com/softwaremill/sttp/Multipart.scala
+++ b/core/src/main/scala/com/softwaremill/sttp/Multipart.scala
@@ -1,7 +1,5 @@
 package com.softwaremill.sttp
 
-import com.softwaremill.sttp.model.BasicRequestBody
-
 /**
   * Use the factory methods `multipart` to conveniently create instances of
   * this class. A part can be then further customised using `fileName`,
diff --git a/core/src/main/scala/com/softwaremill/sttp/model/RequestBody.scala b/core/src/main/scala/com/softwaremill/sttp/RequestBody.scala
index 5d43298..a8be76b 100644
--- a/core/src/main/scala/com/softwaremill/sttp/model/RequestBody.scala
+++ b/core/src/main/scala/com/softwaremill/sttp/RequestBody.scala
@@ -1,12 +1,10 @@
-package com.softwaremill.sttp.model
+package com.softwaremill.sttp
 
 import java.io.InputStream
 import java.net.URLEncoder
 import java.nio.ByteBuffer
 import java.nio.file.Path
 
-import com.softwaremill.sttp._
-
 import scala.collection.immutable.Seq
 
 sealed trait RequestBody[+S]
diff --git a/core/src/main/scala/com/softwaremill/sttp/RequestT.scala b/core/src/main/scala/com/softwaremill/sttp/RequestT.scala
index 1461ac6..88f64e3 100644
--- a/core/src/main/scala/com/softwaremill/sttp/RequestT.scala
+++ b/core/src/main/scala/com/softwaremill/sttp/RequestT.scala
@@ -5,8 +5,6 @@ import java.nio.ByteBuffer
 import java.nio.file.Path
 import java.util.Base64
 
-import com.softwaremill.sttp.model._
-
 import scala.collection.immutable.Seq
 
 import scala.language.higherKinds
diff --git a/core/src/main/scala/com/softwaremill/sttp/model/ResponseAs.scala b/core/src/main/scala/com/softwaremill/sttp/ResponseAs.scala
index 5a008ed..14d3606 100644
--- a/core/src/main/scala/com/softwaremill/sttp/model/ResponseAs.scala
+++ b/core/src/main/scala/com/softwaremill/sttp/ResponseAs.scala
@@ -1,10 +1,8 @@
-package com.softwaremill.sttp.model
+package com.softwaremill.sttp
 
 import java.io.{File, FileOutputStream, IOException, InputStream}
 import java.net.URLDecoder
 
-import com.softwaremill.sttp.{MonadError, transfer}
-
 import scala.collection.immutable.Seq
 import scala.language.higherKinds
 import scala.util.Try
diff --git a/core/src/main/scala/com/softwaremill/sttp/package.scala b/core/src/main/scala/com/softwaremill/sttp/package.scala
index bbd777e..69f20f0 100644
--- a/core/src/main/scala/com/softwaremill/sttp/package.scala
+++ b/core/src/main/scala/com/softwaremill/sttp/package.scala
@@ -4,8 +4,6 @@ import java.io._
 import java.nio.ByteBuffer
 import java.nio.file.Path
 
-import com.softwaremill.sttp.model._
-
 import scala.annotation.{implicitNotFound, tailrec}
 import scala.language.higherKinds
 import scala.collection.immutable.Seq
diff --git a/okhttp-client-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala b/okhttp-client-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala
index 3d65100..758fbb5 100644
--- a/okhttp-client-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala
+++ b/okhttp-client-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala
@@ -4,8 +4,7 @@ import java.io.IOException
 import java.nio.charset.Charset
 
 import com.softwaremill.sttp._
-import com.softwaremill.sttp.model.ResponseAs.EagerResponseHandler
-import com.softwaremill.sttp.model._
+import ResponseAs.EagerResponseHandler
 import okhttp3.internal.http.HttpMethod
 import okhttp3.{
   Call,