Step 1 for #980, rename API module into AHC

AsyncHttpClient · Sep 25, 2015 · a811689 · a811689
1 parent 9cbdb73
commit a811689
Show file tree

Hide file tree

Showing 245 changed files with 8 additions and 10 deletions.
diff --git a/api/pom.xml → client/pom.xml b/api/pom.xml → client/pom.xml
@@ -5,11 +5,9 @@
 		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>async-http-client-api</artifactId>
-	<name>Asynchronous Http Client API</name>
-	<description>
-        The Async Http Client (AHC) API classes.
-    </description>
+	<artifactId>async-http-client</artifactId>
+	<name>Asynchronous Http Client</name>
+	<description>The Async Http Client (AHC) classes.</description>
 
 	<build>
 		<plugins>

diff --git a/...ynchttpclient/AsyncCompletionHandler.java → ...ynchttpclient/AsyncCompletionHandler.java b/...ynchttpclient/AsyncCompletionHandler.java → ...ynchttpclient/AsyncCompletionHandler.java
diff --git a/...ttpclient/AsyncCompletionHandlerBase.java → ...ttpclient/AsyncCompletionHandlerBase.java b/...ttpclient/AsyncCompletionHandlerBase.java → ...ttpclient/AsyncCompletionHandlerBase.java
diff --git a/...ava/org/asynchttpclient/AsyncHandler.java → ...ava/org/asynchttpclient/AsyncHandler.java b/...ava/org/asynchttpclient/AsyncHandler.java → ...ava/org/asynchttpclient/AsyncHandler.java
diff --git a/.../org/asynchttpclient/AsyncHttpClient.java → .../org/asynchttpclient/AsyncHttpClient.java b/.../org/asynchttpclient/AsyncHttpClient.java → .../org/asynchttpclient/AsyncHttpClient.java
diff --git a/...synchttpclient/AsyncHttpClientConfig.java → ...synchttpclient/AsyncHttpClientConfig.java b/...synchttpclient/AsyncHttpClientConfig.java → ...synchttpclient/AsyncHttpClientConfig.java
diff --git a/...rg/asynchttpclient/AsyncHttpProvider.java → ...rg/asynchttpclient/AsyncHttpProvider.java b/...rg/asynchttpclient/AsyncHttpProvider.java → ...rg/asynchttpclient/AsyncHttpProvider.java
diff --git a/...nchttpclient/AsyncHttpProviderConfig.java → ...nchttpclient/AsyncHttpProviderConfig.java b/...nchttpclient/AsyncHttpProviderConfig.java → ...nchttpclient/AsyncHttpProviderConfig.java
diff --git a/.../asynchttpclient/BoundRequestBuilder.java → .../asynchttpclient/BoundRequestBuilder.java b/.../asynchttpclient/BoundRequestBuilder.java → .../asynchttpclient/BoundRequestBuilder.java
diff --git a/...ynchttpclient/DefaultAsyncHttpClient.java → ...ynchttpclient/DefaultAsyncHttpClient.java b/...ynchttpclient/DefaultAsyncHttpClient.java → ...ynchttpclient/DefaultAsyncHttpClient.java
diff --git a/...ient/FluentCaseInsensitiveStringsMap.java → ...ient/FluentCaseInsensitiveStringsMap.java b/...ient/FluentCaseInsensitiveStringsMap.java → ...ient/FluentCaseInsensitiveStringsMap.java
diff --git a/...org/asynchttpclient/FluentStringsMap.java → ...org/asynchttpclient/FluentStringsMap.java b/...org/asynchttpclient/FluentStringsMap.java → ...org/asynchttpclient/FluentStringsMap.java
diff --git a/...asynchttpclient/HttpResponseBodyPart.java → ...asynchttpclient/HttpResponseBodyPart.java b/...asynchttpclient/HttpResponseBodyPart.java → ...asynchttpclient/HttpResponseBodyPart.java
diff --git a/.../asynchttpclient/HttpResponseHeaders.java → .../asynchttpclient/HttpResponseHeaders.java b/.../asynchttpclient/HttpResponseHeaders.java → .../asynchttpclient/HttpResponseHeaders.java
diff --git a/...g/asynchttpclient/HttpResponseStatus.java → ...g/asynchttpclient/HttpResponseStatus.java b/...g/asynchttpclient/HttpResponseStatus.java → ...g/asynchttpclient/HttpResponseStatus.java
diff --git a/...org/asynchttpclient/ListenableFuture.java → ...org/asynchttpclient/ListenableFuture.java b/...org/asynchttpclient/ListenableFuture.java → ...org/asynchttpclient/ListenableFuture.java
diff --git a/.../main/java/org/asynchttpclient/Param.java → .../main/java/org/asynchttpclient/Param.java b/.../main/java/org/asynchttpclient/Param.java → .../main/java/org/asynchttpclient/Param.java
diff --git a/.../main/java/org/asynchttpclient/Realm.java → .../main/java/org/asynchttpclient/Realm.java b/.../main/java/org/asynchttpclient/Realm.java → .../main/java/org/asynchttpclient/Realm.java
diff --git a/...ain/java/org/asynchttpclient/Request.java → ...ain/java/org/asynchttpclient/Request.java b/...ain/java/org/asynchttpclient/Request.java → ...ain/java/org/asynchttpclient/Request.java
diff --git a/...a/org/asynchttpclient/RequestBuilder.java → ...a/org/asynchttpclient/RequestBuilder.java b/...a/org/asynchttpclient/RequestBuilder.java → ...a/org/asynchttpclient/RequestBuilder.java
diff --git a/...g/asynchttpclient/RequestBuilderBase.java → ...g/asynchttpclient/RequestBuilderBase.java b/...g/asynchttpclient/RequestBuilderBase.java → ...g/asynchttpclient/RequestBuilderBase.java
diff --git a/...in/java/org/asynchttpclient/Response.java → ...in/java/org/asynchttpclient/Response.java b/...in/java/org/asynchttpclient/Response.java → ...in/java/org/asynchttpclient/Response.java
diff --git a/...ava/org/asynchttpclient/ResponseBase.java → ...ava/org/asynchttpclient/ResponseBase.java b/...ava/org/asynchttpclient/ResponseBase.java → ...ava/org/asynchttpclient/ResponseBase.java
diff --git a/.../asynchttpclient/SignatureCalculator.java → .../asynchttpclient/SignatureCalculator.java b/.../asynchttpclient/SignatureCalculator.java → .../asynchttpclient/SignatureCalculator.java
diff --git a/...chttpclient/channel/ChannelConnector.java → ...chttpclient/channel/ChannelConnector.java b/...chttpclient/channel/ChannelConnector.java → ...chttpclient/channel/ChannelConnector.java
diff --git a/...ynchttpclient/channel/NameResolution.java → ...ynchttpclient/channel/NameResolution.java b/...ynchttpclient/channel/NameResolution.java → ...ynchttpclient/channel/NameResolution.java
diff --git a/...asynchttpclient/channel/NameResolver.java → ...asynchttpclient/channel/NameResolver.java b/...asynchttpclient/channel/NameResolver.java → ...asynchttpclient/channel/NameResolver.java
diff --git a/...chttpclient/channel/SSLEngineFactory.java → ...chttpclient/channel/SSLEngineFactory.java b/...chttpclient/channel/SSLEngineFactory.java → ...chttpclient/channel/SSLEngineFactory.java
diff --git a/...nnel/pool/ConnectionPoolPartitioning.java → ...nnel/pool/ConnectionPoolPartitioning.java b/...nnel/pool/ConnectionPoolPartitioning.java → ...nnel/pool/ConnectionPoolPartitioning.java
diff --git a/...ient/channel/pool/ConnectionStrategy.java → ...ient/channel/pool/ConnectionStrategy.java b/...ient/channel/pool/ConnectionStrategy.java → ...ient/channel/pool/ConnectionStrategy.java
diff --git a/...ent/config/AsyncHttpClientConfigBean.java → ...ent/config/AsyncHttpClientConfigBean.java b/...ent/config/AsyncHttpClientConfigBean.java → ...ent/config/AsyncHttpClientConfigBean.java
diff --git a/...config/AsyncHttpClientConfigDefaults.java → ...config/AsyncHttpClientConfigDefaults.java b/...config/AsyncHttpClientConfigDefaults.java → ...config/AsyncHttpClientConfigDefaults.java
diff --git a/...t/config/AsyncHttpClientConfigHelper.java → ...t/config/AsyncHttpClientConfigHelper.java b/...t/config/AsyncHttpClientConfigHelper.java → ...t/config/AsyncHttpClientConfigHelper.java
diff --git a/...va/org/asynchttpclient/cookie/Cookie.java → ...va/org/asynchttpclient/cookie/Cookie.java b/...va/org/asynchttpclient/cookie/Cookie.java → ...va/org/asynchttpclient/cookie/Cookie.java
diff --git a/...asynchttpclient/cookie/CookieDecoder.java → ...asynchttpclient/cookie/CookieDecoder.java b/...asynchttpclient/cookie/CookieDecoder.java → ...asynchttpclient/cookie/CookieDecoder.java
diff --git a/...asynchttpclient/cookie/CookieEncoder.java → ...asynchttpclient/cookie/CookieEncoder.java b/...asynchttpclient/cookie/CookieEncoder.java → ...asynchttpclient/cookie/CookieEncoder.java
diff --git a/...rg/asynchttpclient/cookie/CookieUtil.java → ...rg/asynchttpclient/cookie/CookieUtil.java b/...rg/asynchttpclient/cookie/CookieUtil.java → ...rg/asynchttpclient/cookie/CookieUtil.java
diff --git a/...chttpclient/cookie/RFC2616DateParser.java → ...chttpclient/cookie/RFC2616DateParser.java b/...chttpclient/cookie/RFC2616DateParser.java → ...chttpclient/cookie/RFC2616DateParser.java
diff --git a/...httpclient/extra/AsyncHandlerWrapper.java → ...httpclient/extra/AsyncHandlerWrapper.java b/...httpclient/extra/AsyncHandlerWrapper.java → ...httpclient/extra/AsyncHandlerWrapper.java
diff --git a/...ra/ResumableRandomAccessFileListener.java → ...ra/ResumableRandomAccessFileListener.java b/...ra/ResumableRandomAccessFileListener.java → ...ra/ResumableRandomAccessFileListener.java
diff --git a/...tpclient/extra/ThrottleRequestFilter.java → ...tpclient/extra/ThrottleRequestFilter.java b/...tpclient/extra/ThrottleRequestFilter.java → ...tpclient/extra/ThrottleRequestFilter.java
diff --git a/...asynchttpclient/filter/FilterContext.java → ...asynchttpclient/filter/FilterContext.java b/...asynchttpclient/filter/FilterContext.java → ...asynchttpclient/filter/FilterContext.java
diff --git a/...ynchttpclient/filter/FilterException.java → ...ynchttpclient/filter/FilterException.java b/...ynchttpclient/filter/FilterException.java → ...ynchttpclient/filter/FilterException.java
diff --git a/...chttpclient/filter/IOExceptionFilter.java → ...chttpclient/filter/IOExceptionFilter.java b/...chttpclient/filter/IOExceptionFilter.java → ...chttpclient/filter/IOExceptionFilter.java
diff --git a/...asynchttpclient/filter/RequestFilter.java → ...asynchttpclient/filter/RequestFilter.java b/...asynchttpclient/filter/RequestFilter.java → ...asynchttpclient/filter/RequestFilter.java
diff --git a/...synchttpclient/filter/ResponseFilter.java → ...synchttpclient/filter/ResponseFilter.java b/...synchttpclient/filter/ResponseFilter.java → ...synchttpclient/filter/ResponseFilter.java
diff --git a/...ient/future/AbstractListenableFuture.java → ...ient/future/AbstractListenableFuture.java b/...ient/future/AbstractListenableFuture.java → ...ient/future/AbstractListenableFuture.java
diff --git a/...asynchttpclient/future/ExecutionList.java → ...asynchttpclient/future/ExecutionList.java b/...asynchttpclient/future/ExecutionList.java → ...asynchttpclient/future/ExecutionList.java
diff --git a/...lient/handler/AsyncHandlerExtensions.java → ...lient/handler/AsyncHandlerExtensions.java b/...lient/handler/AsyncHandlerExtensions.java → ...lient/handler/AsyncHandlerExtensions.java
diff --git a/...nt/handler/BodyDeferringAsyncHandler.java → ...nt/handler/BodyDeferringAsyncHandler.java b/...nt/handler/BodyDeferringAsyncHandler.java → ...nt/handler/BodyDeferringAsyncHandler.java
diff --git a/...pclient/handler/MaxRedirectException.java → ...pclient/handler/MaxRedirectException.java b/...pclient/handler/MaxRedirectException.java → ...pclient/handler/MaxRedirectException.java
diff --git a/...pclient/handler/ProgressAsyncHandler.java → ...pclient/handler/ProgressAsyncHandler.java b/...pclient/handler/ProgressAsyncHandler.java → ...pclient/handler/ProgressAsyncHandler.java
diff --git a/...pclient/handler/StreamedAsyncHandler.java → ...pclient/handler/StreamedAsyncHandler.java b/...pclient/handler/StreamedAsyncHandler.java → ...pclient/handler/StreamedAsyncHandler.java
diff --git a/...nt/handler/TransferCompletionHandler.java → ...nt/handler/TransferCompletionHandler.java b/...nt/handler/TransferCompletionHandler.java → ...nt/handler/TransferCompletionHandler.java
diff --git a/...chttpclient/handler/TransferListener.java → ...chttpclient/handler/TransferListener.java b/...chttpclient/handler/TransferListener.java → ...chttpclient/handler/TransferListener.java
diff --git a/...le/PropertiesBasedResumableProcessor.java → ...le/PropertiesBasedResumableProcessor.java b/...le/PropertiesBasedResumableProcessor.java → ...le/PropertiesBasedResumableProcessor.java
diff --git a/...dler/resumable/ResumableAsyncHandler.java → ...dler/resumable/ResumableAsyncHandler.java b/...dler/resumable/ResumableAsyncHandler.java → ...dler/resumable/ResumableAsyncHandler.java
diff --git a/...resumable/ResumableIOExceptionFilter.java → ...resumable/ResumableIOExceptionFilter.java b/...resumable/ResumableIOExceptionFilter.java → ...resumable/ResumableIOExceptionFilter.java
diff --git a/.../handler/resumable/ResumableListener.java → .../handler/resumable/ResumableListener.java b/.../handler/resumable/ResumableListener.java → .../handler/resumable/ResumableListener.java
diff --git a/.../internal/jsr166/ConcurrentHashMapV8.java → .../internal/jsr166/ConcurrentHashMapV8.java b/.../internal/jsr166/ConcurrentHashMapV8.java → .../internal/jsr166/ConcurrentHashMapV8.java
diff --git a/...ent/internal/jsr166/CountedCompleter.java → ...ent/internal/jsr166/CountedCompleter.java b/...ent/internal/jsr166/CountedCompleter.java → ...ent/internal/jsr166/CountedCompleter.java
diff --git a/...pclient/internal/jsr166/ForkJoinPool.java → ...pclient/internal/jsr166/ForkJoinPool.java b/...pclient/internal/jsr166/ForkJoinPool.java → ...pclient/internal/jsr166/ForkJoinPool.java
diff --git a/...pclient/internal/jsr166/ForkJoinTask.java → ...pclient/internal/jsr166/ForkJoinTask.java b/...pclient/internal/jsr166/ForkJoinTask.java → ...pclient/internal/jsr166/ForkJoinTask.java
diff --git a/...internal/jsr166/ForkJoinWorkerThread.java → ...internal/jsr166/ForkJoinWorkerThread.java b/...internal/jsr166/ForkJoinWorkerThread.java → ...internal/jsr166/ForkJoinWorkerThread.java
diff --git a/...httpclient/internal/jsr166/LongAdder.java → ...httpclient/internal/jsr166/LongAdder.java b/...httpclient/internal/jsr166/LongAdder.java → ...httpclient/internal/jsr166/LongAdder.java
diff --git a/...httpclient/internal/jsr166/Striped64.java → ...httpclient/internal/jsr166/Striped64.java b/...httpclient/internal/jsr166/Striped64.java → ...httpclient/internal/jsr166/Striped64.java
diff --git a/...nt/internal/jsr166/ThreadLocalRandom.java → ...nt/internal/jsr166/ThreadLocalRandom.java b/...nt/internal/jsr166/ThreadLocalRandom.java → ...nt/internal/jsr166/ThreadLocalRandom.java
diff --git a/...g/asynchttpclient/netty/DiscardEvent.java → ...g/asynchttpclient/netty/DiscardEvent.java b/...g/asynchttpclient/netty/DiscardEvent.java → ...g/asynchttpclient/netty/DiscardEvent.java
diff --git a/...pclient/netty/NettyAsyncHttpProvider.java → ...pclient/netty/NettyAsyncHttpProvider.java b/...pclient/netty/NettyAsyncHttpProvider.java → ...pclient/netty/NettyAsyncHttpProvider.java
diff --git a/...el/pool/ChannelPoolPartitionSelector.java → ...el/pool/ChannelPoolPartitionSelector.java b/...el/pool/ChannelPoolPartitionSelector.java → ...el/pool/ChannelPoolPartitionSelector.java
diff --git a/...ent/netty/future/StackTraceInspector.java → ...ent/netty/future/StackTraceInspector.java b/...ent/netty/future/StackTraceInspector.java → ...ent/netty/future/StackTraceInspector.java
diff --git a/...etty/request/NettyRequestFactoryBase.java → ...etty/request/NettyRequestFactoryBase.java b/...etty/request/NettyRequestFactoryBase.java → ...etty/request/NettyRequestFactoryBase.java
diff --git a/.../org/asynchttpclient/ntlm/NtlmEngine.java → .../org/asynchttpclient/ntlm/NtlmEngine.java b/.../org/asynchttpclient/ntlm/NtlmEngine.java → .../org/asynchttpclient/ntlm/NtlmEngine.java
diff --git a/...chttpclient/ntlm/NtlmEngineException.java → ...chttpclient/ntlm/NtlmEngineException.java b/...chttpclient/ntlm/NtlmEngineException.java → ...chttpclient/ntlm/NtlmEngineException.java
diff --git a/...a/org/asynchttpclient/ntlm/NtlmUtils.java → ...a/org/asynchttpclient/ntlm/NtlmUtils.java b/...a/org/asynchttpclient/ntlm/NtlmUtils.java → ...a/org/asynchttpclient/ntlm/NtlmUtils.java
diff --git a/...rg/asynchttpclient/oauth/ConsumerKey.java → ...rg/asynchttpclient/oauth/ConsumerKey.java b/...rg/asynchttpclient/oauth/ConsumerKey.java → ...rg/asynchttpclient/oauth/ConsumerKey.java
diff --git a/...lient/oauth/OAuthSignatureCalculator.java → ...lient/oauth/OAuthSignatureCalculator.java b/...lient/oauth/OAuthSignatureCalculator.java → ...lient/oauth/OAuthSignatureCalculator.java
diff --git a/...g/asynchttpclient/oauth/RequestToken.java → ...g/asynchttpclient/oauth/RequestToken.java b/...g/asynchttpclient/oauth/RequestToken.java → ...g/asynchttpclient/oauth/RequestToken.java
diff --git a/...asynchttpclient/oauth/ThreadSafeHMAC.java → ...asynchttpclient/oauth/ThreadSafeHMAC.java b/...asynchttpclient/oauth/ThreadSafeHMAC.java → ...asynchttpclient/oauth/ThreadSafeHMAC.java
diff --git a/...rg/asynchttpclient/proxy/ProxyServer.java → ...rg/asynchttpclient/proxy/ProxyServer.java b/...rg/asynchttpclient/proxy/ProxyServer.java → ...rg/asynchttpclient/proxy/ProxyServer.java
diff --git a/...httpclient/proxy/ProxyServerSelector.java → ...httpclient/proxy/ProxyServerSelector.java b/...httpclient/proxy/ProxyServerSelector.java → ...httpclient/proxy/ProxyServerSelector.java
diff --git a/...rg/asynchttpclient/request/body/Body.java → ...rg/asynchttpclient/request/body/Body.java b/...rg/asynchttpclient/request/body/Body.java → ...rg/asynchttpclient/request/body/Body.java
diff --git a/...client/request/body/RandomAccessBody.java → ...client/request/body/RandomAccessBody.java b/...client/request/body/RandomAccessBody.java → ...client/request/body/RandomAccessBody.java
diff --git a/...request/body/generator/BodyGenerator.java → ...request/body/generator/BodyGenerator.java b/...request/body/generator/BodyGenerator.java → ...request/body/generator/BodyGenerator.java
diff --git a/...ody/generator/ByteArrayBodyGenerator.java → ...ody/generator/ByteArrayBodyGenerator.java b/...ody/generator/ByteArrayBodyGenerator.java → ...ody/generator/ByteArrayBodyGenerator.java
diff --git a/...body/generator/FeedableBodyGenerator.java → ...body/generator/FeedableBodyGenerator.java b/...body/generator/FeedableBodyGenerator.java → ...body/generator/FeedableBodyGenerator.java
diff --git a/...est/body/generator/FileBodyGenerator.java → ...est/body/generator/FileBodyGenerator.java b/...est/body/generator/FileBodyGenerator.java → ...est/body/generator/FileBodyGenerator.java
diff --git a/...y/generator/InputStreamBodyGenerator.java → ...y/generator/InputStreamBodyGenerator.java b/...y/generator/InputStreamBodyGenerator.java → ...y/generator/InputStreamBodyGenerator.java
diff --git a/...nerator/ReactiveStreamsBodyGenerator.java → ...nerator/ReactiveStreamsBodyGenerator.java b/...nerator/ReactiveStreamsBodyGenerator.java → ...nerator/ReactiveStreamsBodyGenerator.java
diff --git a/...enerator/SimpleFeedableBodyGenerator.java → ...enerator/SimpleFeedableBodyGenerator.java b/...enerator/SimpleFeedableBodyGenerator.java → ...enerator/SimpleFeedableBodyGenerator.java
diff --git a/...uest/body/multipart/AbstractFilePart.java → ...uest/body/multipart/AbstractFilePart.java b/...uest/body/multipart/AbstractFilePart.java → ...uest/body/multipart/AbstractFilePart.java
diff --git a/...request/body/multipart/ByteArrayPart.java → ...request/body/multipart/ByteArrayPart.java b/...request/body/multipart/ByteArrayPart.java → ...request/body/multipart/ByteArrayPart.java
diff --git a/...st/body/multipart/CounterPartVisitor.java → ...st/body/multipart/CounterPartVisitor.java b/...st/body/multipart/CounterPartVisitor.java → ...st/body/multipart/CounterPartVisitor.java
diff --git a/...ient/request/body/multipart/FilePart.java → ...ient/request/body/multipart/FilePart.java b/...ient/request/body/multipart/FilePart.java → ...ient/request/body/multipart/FilePart.java
diff --git a/.../body/multipart/FilePartStallHandler.java → .../body/multipart/FilePartStallHandler.java b/.../body/multipart/FilePartStallHandler.java → .../body/multipart/FilePartStallHandler.java
diff --git a/...multipart/FileUploadStalledException.java → ...multipart/FileUploadStalledException.java b/...multipart/FileUploadStalledException.java → ...multipart/FileUploadStalledException.java
diff --git a/...request/body/multipart/MultipartBody.java → ...request/body/multipart/MultipartBody.java b/...request/body/multipart/MultipartBody.java → ...request/body/multipart/MultipartBody.java
diff --git a/...equest/body/multipart/MultipartUtils.java → ...equest/body/multipart/MultipartUtils.java b/...equest/body/multipart/MultipartUtils.java → ...equest/body/multipart/MultipartUtils.java
diff --git a/...dy/multipart/OutputStreamPartVisitor.java → ...dy/multipart/OutputStreamPartVisitor.java b/...dy/multipart/OutputStreamPartVisitor.java → ...dy/multipart/OutputStreamPartVisitor.java
diff --git a/...tpclient/request/body/multipart/Part.java → ...tpclient/request/body/multipart/Part.java b/...tpclient/request/body/multipart/Part.java → ...tpclient/request/body/multipart/Part.java
diff --git a/...ient/request/body/multipart/PartBase.java → ...ient/request/body/multipart/PartBase.java b/...ient/request/body/multipart/PartBase.java → ...ient/request/body/multipart/PartBase.java
diff --git a/...t/request/body/multipart/PartVisitor.java → ...t/request/body/multipart/PartVisitor.java b/...t/request/body/multipart/PartVisitor.java → ...t/request/body/multipart/PartVisitor.java
diff --git a/...nt/request/body/multipart/StringPart.java → ...nt/request/body/multipart/StringPart.java b/...nt/request/body/multipart/StringPart.java → ...nt/request/body/multipart/StringPart.java
diff --git a/...org/asynchttpclient/simple/HeaderMap.java → ...org/asynchttpclient/simple/HeaderMap.java b/...org/asynchttpclient/simple/HeaderMap.java → ...org/asynchttpclient/simple/HeaderMap.java
diff --git a/...ent/simple/SimpleAHCTransferListener.java → ...ent/simple/SimpleAHCTransferListener.java b/...ent/simple/SimpleAHCTransferListener.java → ...ent/simple/SimpleAHCTransferListener.java
diff --git a/...pclient/simple/SimpleAsyncHttpClient.java → ...pclient/simple/SimpleAsyncHttpClient.java b/...pclient/simple/SimpleAsyncHttpClient.java → ...pclient/simple/SimpleAsyncHttpClient.java
diff --git a/...nchttpclient/simple/ThrowableHandler.java → ...nchttpclient/simple/ThrowableHandler.java b/...nchttpclient/simple/ThrowableHandler.java → ...nchttpclient/simple/ThrowableHandler.java
diff --git a/...mple/consumer/AppendableBodyConsumer.java → ...mple/consumer/AppendableBodyConsumer.java b/...mple/consumer/AppendableBodyConsumer.java → ...mple/consumer/AppendableBodyConsumer.java
diff --git a/...pclient/simple/consumer/BodyConsumer.java → ...pclient/simple/consumer/BodyConsumer.java b/...pclient/simple/consumer/BodyConsumer.java → ...pclient/simple/consumer/BodyConsumer.java
diff --git a/...mple/consumer/ByteBufferBodyConsumer.java → ...mple/consumer/ByteBufferBodyConsumer.java b/...mple/consumer/ByteBufferBodyConsumer.java → ...mple/consumer/ByteBufferBodyConsumer.java
diff --git a/...ent/simple/consumer/FileBodyConsumer.java → ...ent/simple/consumer/FileBodyConsumer.java b/...ent/simple/consumer/FileBodyConsumer.java → ...ent/simple/consumer/FileBodyConsumer.java
diff --git a/...le/consumer/OutputStreamBodyConsumer.java → ...le/consumer/OutputStreamBodyConsumer.java b/...le/consumer/OutputStreamBodyConsumer.java → ...le/consumer/OutputStreamBodyConsumer.java
diff --git a/...imple/consumer/ResumableBodyConsumer.java → ...imple/consumer/ResumableBodyConsumer.java b/...imple/consumer/ResumableBodyConsumer.java → ...imple/consumer/ResumableBodyConsumer.java
diff --git a/.../asynchttpclient/spnego/SpnegoEngine.java → .../asynchttpclient/spnego/SpnegoEngine.java b/.../asynchttpclient/spnego/SpnegoEngine.java → .../asynchttpclient/spnego/SpnegoEngine.java
diff --git a/...pclient/spnego/SpnegoEngineException.java → ...pclient/spnego/SpnegoEngineException.java b/...pclient/spnego/SpnegoEngineException.java → ...pclient/spnego/SpnegoEngineException.java
diff --git a/...tpclient/spnego/SpnegoTokenGenerator.java → ...tpclient/spnego/SpnegoTokenGenerator.java b/...tpclient/spnego/SpnegoTokenGenerator.java → ...tpclient/spnego/SpnegoTokenGenerator.java
diff --git a/...ain/java/org/asynchttpclient/uri/Uri.java → ...ain/java/org/asynchttpclient/uri/Uri.java b/...ain/java/org/asynchttpclient/uri/Uri.java → ...ain/java/org/asynchttpclient/uri/Uri.java
diff --git a/...va/org/asynchttpclient/uri/UriParser.java → ...va/org/asynchttpclient/uri/UriParser.java b/...va/org/asynchttpclient/uri/UriParser.java → ...va/org/asynchttpclient/uri/UriParser.java
diff --git a/...tpclient/util/AsyncHttpProviderUtils.java → ...tpclient/util/AsyncHttpProviderUtils.java b/...tpclient/util/AsyncHttpProviderUtils.java → ...tpclient/util/AsyncHttpProviderUtils.java
diff --git a/...nchttpclient/util/AuthenticatorUtils.java → ...nchttpclient/util/AuthenticatorUtils.java b/...nchttpclient/util/AuthenticatorUtils.java → ...nchttpclient/util/AuthenticatorUtils.java
diff --git a/...java/org/asynchttpclient/util/Base64.java → ...java/org/asynchttpclient/util/Base64.java b/...java/org/asynchttpclient/util/Base64.java → ...java/org/asynchttpclient/util/Base64.java
diff --git a/...a/org/asynchttpclient/util/DateUtils.java → ...a/org/asynchttpclient/util/DateUtils.java b/...a/org/asynchttpclient/util/DateUtils.java → ...a/org/asynchttpclient/util/DateUtils.java
diff --git a/...a/org/asynchttpclient/util/MiscUtils.java → ...a/org/asynchttpclient/util/MiscUtils.java b/...a/org/asynchttpclient/util/MiscUtils.java → ...a/org/asynchttpclient/util/MiscUtils.java
diff --git a/...nt/util/PrefixIncrementThreadFactory.java → ...nt/util/PrefixIncrementThreadFactory.java b/...nt/util/PrefixIncrementThreadFactory.java → ...nt/util/PrefixIncrementThreadFactory.java
diff --git a/.../org/asynchttpclient/util/ProxyUtils.java → .../org/asynchttpclient/util/ProxyUtils.java b/.../org/asynchttpclient/util/ProxyUtils.java → .../org/asynchttpclient/util/ProxyUtils.java
diff --git a/...va/org/asynchttpclient/util/SslUtils.java → ...va/org/asynchttpclient/util/SslUtils.java b/...va/org/asynchttpclient/util/SslUtils.java → ...va/org/asynchttpclient/util/SslUtils.java
diff --git a/...nchttpclient/util/StringCharSequence.java → ...nchttpclient/util/StringCharSequence.java b/...nchttpclient/util/StringCharSequence.java → ...nchttpclient/util/StringCharSequence.java
diff --git a/...org/asynchttpclient/util/StringUtils.java → ...org/asynchttpclient/util/StringUtils.java b/...org/asynchttpclient/util/StringUtils.java → ...org/asynchttpclient/util/StringUtils.java
diff --git a/.../org/asynchttpclient/util/UriEncoder.java → .../org/asynchttpclient/util/UriEncoder.java b/.../org/asynchttpclient/util/UriEncoder.java → .../org/asynchttpclient/util/UriEncoder.java
diff --git a/.../asynchttpclient/util/Utf8UrlDecoder.java → .../asynchttpclient/util/Utf8UrlDecoder.java b/.../asynchttpclient/util/Utf8UrlDecoder.java → .../asynchttpclient/util/Utf8UrlDecoder.java
diff --git a/.../asynchttpclient/util/Utf8UrlEncoder.java → .../asynchttpclient/util/Utf8UrlEncoder.java b/.../asynchttpclient/util/Utf8UrlEncoder.java → .../asynchttpclient/util/Utf8UrlEncoder.java
diff --git a/...t/webdav/WebDavCompletionHandlerBase.java → ...t/webdav/WebDavCompletionHandlerBase.java b/...t/webdav/WebDavCompletionHandlerBase.java → ...t/webdav/WebDavCompletionHandlerBase.java
diff --git a/...synchttpclient/webdav/WebDavResponse.java → ...synchttpclient/webdav/WebDavResponse.java b/...synchttpclient/webdav/WebDavResponse.java → ...synchttpclient/webdav/WebDavResponse.java
diff --git a/...tpclient/ws/DefaultWebSocketListener.java → ...tpclient/ws/DefaultWebSocketListener.java b/...tpclient/ws/DefaultWebSocketListener.java → ...tpclient/ws/DefaultWebSocketListener.java
diff --git a/...rg/asynchttpclient/ws/UpgradeHandler.java → ...rg/asynchttpclient/ws/UpgradeHandler.java b/...rg/asynchttpclient/ws/UpgradeHandler.java → ...rg/asynchttpclient/ws/UpgradeHandler.java
diff --git a/...ava/org/asynchttpclient/ws/WebSocket.java → ...ava/org/asynchttpclient/ws/WebSocket.java b/...ava/org/asynchttpclient/ws/WebSocket.java → ...ava/org/asynchttpclient/ws/WebSocket.java
diff --git a/...ent/ws/WebSocketByteFragmentListener.java → ...ent/ws/WebSocketByteFragmentListener.java b/...ent/ws/WebSocketByteFragmentListener.java → ...ent/ws/WebSocketByteFragmentListener.java
diff --git a/...chttpclient/ws/WebSocketByteListener.java → ...chttpclient/ws/WebSocketByteListener.java b/...chttpclient/ws/WebSocketByteListener.java → ...chttpclient/ws/WebSocketByteListener.java
diff --git a/.../ws/WebSocketCloseCodeReasonListener.java → .../ws/WebSocketCloseCodeReasonListener.java b/.../ws/WebSocketCloseCodeReasonListener.java → .../ws/WebSocketCloseCodeReasonListener.java
diff --git a/...asynchttpclient/ws/WebSocketListener.java → ...asynchttpclient/ws/WebSocketListener.java b/...asynchttpclient/ws/WebSocketListener.java → ...asynchttpclient/ws/WebSocketListener.java
diff --git a/...chttpclient/ws/WebSocketPingListener.java → ...chttpclient/ws/WebSocketPingListener.java b/...chttpclient/ws/WebSocketPingListener.java → ...chttpclient/ws/WebSocketPingListener.java
diff --git a/...chttpclient/ws/WebSocketPongListener.java → ...chttpclient/ws/WebSocketPongListener.java b/...chttpclient/ws/WebSocketPongListener.java → ...chttpclient/ws/WebSocketPongListener.java
diff --git a/...ent/ws/WebSocketTextFragmentListener.java → ...ent/ws/WebSocketTextFragmentListener.java b/...ent/ws/WebSocketTextFragmentListener.java → ...ent/ws/WebSocketTextFragmentListener.java
diff --git a/...chttpclient/ws/WebSocketTextListener.java → ...chttpclient/ws/WebSocketTextListener.java b/...chttpclient/ws/WebSocketTextListener.java → ...chttpclient/ws/WebSocketTextListener.java
diff --git a/...ttpclient/ws/WebSocketUpgradeHandler.java → ...ttpclient/ws/WebSocketUpgradeHandler.java b/...ttpclient/ws/WebSocketUpgradeHandler.java → ...ttpclient/ws/WebSocketUpgradeHandler.java
diff --git a/...rg/asynchttpclient/ws/WebSocketUtils.java → ...rg/asynchttpclient/ws/WebSocketUtils.java b/...rg/asynchttpclient/ws/WebSocketUtils.java → ...rg/asynchttpclient/ws/WebSocketUtils.java
diff --git a/...src/main/resources/ahc-default.properties → ...src/main/resources/ahc-default.properties b/...src/main/resources/ahc-default.properties → ...src/main/resources/ahc-default.properties
diff --git a/...src/main/resources/ahc-version.properties → ...src/main/resources/ahc-version.properties b/...src/main/resources/ahc-version.properties → ...src/main/resources/ahc-version.properties
diff --git a/...ynchttpclient/AbstractBasicHttpsTest.java → ...ynchttpclient/AbstractBasicHttpsTest.java b/...ynchttpclient/AbstractBasicHttpsTest.java → ...ynchttpclient/AbstractBasicHttpsTest.java
diff --git a/...rg/asynchttpclient/AbstractBasicTest.java → ...rg/asynchttpclient/AbstractBasicTest.java b/...rg/asynchttpclient/AbstractBasicTest.java → ...rg/asynchttpclient/AbstractBasicTest.java
diff --git a/...tpclient/AsyncHttpClientDefaultsTest.java → ...tpclient/AsyncHttpClientDefaultsTest.java b/...tpclient/AsyncHttpClientDefaultsTest.java → ...tpclient/AsyncHttpClientDefaultsTest.java
diff --git a/...nchttpclient/AsyncProvidersBasicTest.java → ...nchttpclient/AsyncProvidersBasicTest.java b/...nchttpclient/AsyncProvidersBasicTest.java → ...nchttpclient/AsyncProvidersBasicTest.java
diff --git a/...ynchttpclient/AsyncStreamHandlerTest.java → ...ynchttpclient/AsyncStreamHandlerTest.java b/...ynchttpclient/AsyncStreamHandlerTest.java → ...ynchttpclient/AsyncStreamHandlerTest.java
diff --git a/...chttpclient/AsyncStreamLifecycleTest.java → ...chttpclient/AsyncStreamLifecycleTest.java b/...chttpclient/AsyncStreamLifecycleTest.java → ...chttpclient/AsyncStreamLifecycleTest.java
diff --git a/.../org/asynchttpclient/AuthTimeoutTest.java → .../org/asynchttpclient/AuthTimeoutTest.java b/.../org/asynchttpclient/AuthTimeoutTest.java → .../org/asynchttpclient/AuthTimeoutTest.java
diff --git a/...va/org/asynchttpclient/BasicAuthTest.java → ...va/org/asynchttpclient/BasicAuthTest.java b/...va/org/asynchttpclient/BasicAuthTest.java → ...va/org/asynchttpclient/BasicAuthTest.java
diff --git a/...a/org/asynchttpclient/BasicHttpsTest.java → ...a/org/asynchttpclient/BasicHttpsTest.java b/...a/org/asynchttpclient/BasicHttpsTest.java → ...a/org/asynchttpclient/BasicHttpsTest.java
diff --git a/...ynchttpclient/ByteBufferCapacityTest.java → ...ynchttpclient/ByteBufferCapacityTest.java b/...ynchttpclient/ByteBufferCapacityTest.java → ...ynchttpclient/ByteBufferCapacityTest.java
diff --git a/...rg/asynchttpclient/ComplexClientTest.java → ...rg/asynchttpclient/ComplexClientTest.java b/...rg/asynchttpclient/ComplexClientTest.java → ...rg/asynchttpclient/ComplexClientTest.java
diff --git a/...a/org/asynchttpclient/DigestAuthTest.java → ...a/org/asynchttpclient/DigestAuthTest.java b/...a/org/asynchttpclient/DigestAuthTest.java → ...a/org/asynchttpclient/DigestAuthTest.java
diff --git a/...rg/asynchttpclient/ErrorResponseTest.java → ...rg/asynchttpclient/ErrorResponseTest.java b/...rg/asynchttpclient/ErrorResponseTest.java → ...rg/asynchttpclient/ErrorResponseTest.java
diff --git a/...synchttpclient/Expect100ContinueTest.java → ...synchttpclient/Expect100ContinueTest.java b/...synchttpclient/Expect100ContinueTest.java → ...synchttpclient/Expect100ContinueTest.java
diff --git a/.../FluentCaseInsensitiveStringsMapTest.java → .../FluentCaseInsensitiveStringsMapTest.java b/.../FluentCaseInsensitiveStringsMapTest.java → .../FluentCaseInsensitiveStringsMapTest.java
diff --git a/...asynchttpclient/FluentStringsMapTest.java → ...asynchttpclient/FluentStringsMapTest.java b/...asynchttpclient/FluentStringsMapTest.java → ...asynchttpclient/FluentStringsMapTest.java
diff --git a/.../asynchttpclient/FollowingThreadTest.java → .../asynchttpclient/FollowingThreadTest.java b/.../asynchttpclient/FollowingThreadTest.java → .../asynchttpclient/FollowingThreadTest.java
diff --git a/...java/org/asynchttpclient/Head302Test.java → ...java/org/asynchttpclient/Head302Test.java b/...java/org/asynchttpclient/Head302Test.java → ...java/org/asynchttpclient/Head302Test.java
diff --git a/...nchttpclient/HttpToHttpsRedirectTest.java → ...nchttpclient/HttpToHttpsRedirectTest.java b/...nchttpclient/HttpToHttpsRedirectTest.java → ...nchttpclient/HttpToHttpsRedirectTest.java
diff --git a/...asynchttpclient/IdleStateHandlerTest.java → ...asynchttpclient/IdleStateHandlerTest.java b/...asynchttpclient/IdleStateHandlerTest.java → ...asynchttpclient/IdleStateHandlerTest.java
diff --git a/...asynchttpclient/ListenableFutureTest.java → ...asynchttpclient/ListenableFutureTest.java b/...asynchttpclient/ListenableFutureTest.java → ...asynchttpclient/ListenableFutureTest.java
diff --git a/...g/asynchttpclient/MultipleHeaderTest.java → ...g/asynchttpclient/MultipleHeaderTest.java b/...g/asynchttpclient/MultipleHeaderTest.java → ...g/asynchttpclient/MultipleHeaderTest.java
diff --git a/...g/asynchttpclient/NoNullResponseTest.java → ...g/asynchttpclient/NoNullResponseTest.java b/...g/asynchttpclient/NoNullResponseTest.java → ...g/asynchttpclient/NoNullResponseTest.java
diff --git a/...httpclient/NonAsciiContentLengthTest.java → ...httpclient/NonAsciiContentLengthTest.java b/...httpclient/NonAsciiContentLengthTest.java → ...httpclient/NonAsciiContentLengthTest.java
diff --git a/...rg/asynchttpclient/ParamEncodingTest.java → ...rg/asynchttpclient/ParamEncodingTest.java b/...rg/asynchttpclient/ParamEncodingTest.java → ...rg/asynchttpclient/ParamEncodingTest.java
diff --git a/...httpclient/PerRequestRelative302Test.java → ...httpclient/PerRequestRelative302Test.java b/...httpclient/PerRequestRelative302Test.java → ...httpclient/PerRequestRelative302Test.java
diff --git a/...synchttpclient/PerRequestTimeoutTest.java → ...synchttpclient/PerRequestTimeoutTest.java b/...synchttpclient/PerRequestTimeoutTest.java → ...synchttpclient/PerRequestTimeoutTest.java
diff --git a/.../asynchttpclient/PostRedirectGetTest.java → .../asynchttpclient/PostRedirectGetTest.java b/.../asynchttpclient/PostRedirectGetTest.java → .../asynchttpclient/PostRedirectGetTest.java
diff --git a/...a/org/asynchttpclient/PostWithQSTest.java → ...a/org/asynchttpclient/PostWithQSTest.java b/...a/org/asynchttpclient/PostWithQSTest.java → ...a/org/asynchttpclient/PostWithQSTest.java
diff --git a/.../asynchttpclient/QueryParametersTest.java → .../asynchttpclient/QueryParametersTest.java b/.../asynchttpclient/QueryParametersTest.java → .../asynchttpclient/QueryParametersTest.java
diff --git a/...t/java/org/asynchttpclient/RC10KTest.java → ...t/java/org/asynchttpclient/RC10KTest.java b/...t/java/org/asynchttpclient/RC10KTest.java → ...t/java/org/asynchttpclient/RC10KTest.java
diff --git a/...t/java/org/asynchttpclient/RealmTest.java → ...t/java/org/asynchttpclient/RealmTest.java b/...t/java/org/asynchttpclient/RealmTest.java → ...t/java/org/asynchttpclient/RealmTest.java
diff --git a/...org/asynchttpclient/RedirectBodyTest.java → ...org/asynchttpclient/RedirectBodyTest.java b/...org/asynchttpclient/RedirectBodyTest.java → ...org/asynchttpclient/RedirectBodyTest.java
diff --git a/...tpclient/RedirectConnectionUsageTest.java → ...tpclient/RedirectConnectionUsageTest.java b/...tpclient/RedirectConnectionUsageTest.java → ...tpclient/RedirectConnectionUsageTest.java
diff --git a/.../org/asynchttpclient/Relative302Test.java → .../org/asynchttpclient/Relative302Test.java b/.../org/asynchttpclient/Relative302Test.java → .../org/asynchttpclient/Relative302Test.java
diff --git a/...a/org/asynchttpclient/RemoteSiteTest.java → ...a/org/asynchttpclient/RemoteSiteTest.java b/...a/org/asynchttpclient/RemoteSiteTest.java → ...a/org/asynchttpclient/RemoteSiteTest.java
diff --git a/...g/asynchttpclient/RequestBuilderTest.java → ...g/asynchttpclient/RequestBuilderTest.java b/...g/asynchttpclient/RequestBuilderTest.java → ...g/asynchttpclient/RequestBuilderTest.java
diff --git a/...org/asynchttpclient/RetryRequestTest.java → ...org/asynchttpclient/RetryRequestTest.java b/...org/asynchttpclient/RetryRequestTest.java → ...org/asynchttpclient/RetryRequestTest.java
diff --git a/...a/org/asynchttpclient/ThreadNameTest.java → ...a/org/asynchttpclient/ThreadNameTest.java b/...a/org/asynchttpclient/ThreadNameTest.java → ...a/org/asynchttpclient/ThreadNameTest.java
diff --git a/...ient/channel/MaxConnectionsInThreads.java → ...ient/channel/MaxConnectionsInThreads.java b/...ient/channel/MaxConnectionsInThreads.java → ...ient/channel/MaxConnectionsInThreads.java
diff --git a/...lient/channel/MaxTotalConnectionTest.java → ...lient/channel/MaxTotalConnectionTest.java b/...lient/channel/MaxTotalConnectionTest.java → ...lient/channel/MaxTotalConnectionTest.java
diff --git a/...ient/channel/pool/ConnectionPoolTest.java → ...ient/channel/pool/ConnectionPoolTest.java b/...ient/channel/pool/ConnectionPoolTest.java → ...ient/channel/pool/ConnectionPoolTest.java
diff --git a/...chttpclient/cookie/CookieDecoderTest.java → ...chttpclient/cookie/CookieDecoderTest.java b/...chttpclient/cookie/CookieDecoderTest.java → ...chttpclient/cookie/CookieDecoderTest.java
diff --git a/...pclient/cookie/RFC2616DateParserTest.java → ...pclient/cookie/RFC2616DateParserTest.java b/...pclient/cookie/RFC2616DateParserTest.java → ...pclient/cookie/RFC2616DateParserTest.java
diff --git a/...rg/asynchttpclient/filter/FilterTest.java → ...rg/asynchttpclient/filter/FilterTest.java b/...rg/asynchttpclient/filter/FilterTest.java → ...rg/asynchttpclient/filter/FilterTest.java
diff --git a/...andler/BodyDeferringAsyncHandlerTest.java → ...andler/BodyDeferringAsyncHandlerTest.java b/...andler/BodyDeferringAsyncHandlerTest.java → ...andler/BodyDeferringAsyncHandlerTest.java
diff --git a/...dler/resumable/MapResumableProcessor.java → ...dler/resumable/MapResumableProcessor.java b/...dler/resumable/MapResumableProcessor.java → ...dler/resumable/MapResumableProcessor.java
diff --git a/...ropertiesBasedResumableProcesserTest.java → ...ropertiesBasedResumableProcesserTest.java b/...ropertiesBasedResumableProcesserTest.java → ...ropertiesBasedResumableProcesserTest.java
diff --git a/.../resumable/ResumableAsyncHandlerTest.java → .../resumable/ResumableAsyncHandlerTest.java b/.../resumable/ResumableAsyncHandlerTest.java → .../resumable/ResumableAsyncHandlerTest.java
diff --git a/...va/org/asynchttpclient/ntlm/NtlmTest.java → ...va/org/asynchttpclient/ntlm/NtlmTest.java b/...va/org/asynchttpclient/ntlm/NtlmTest.java → ...va/org/asynchttpclient/ntlm/NtlmTest.java
diff --git a/...t/oauth/OAuthSignatureCalculatorTest.java → ...t/oauth/OAuthSignatureCalculatorTest.java b/...t/oauth/OAuthSignatureCalculatorTest.java → ...t/oauth/OAuthSignatureCalculatorTest.java
diff --git a/.../org/asynchttpclient/proxy/ProxyTest.java → .../org/asynchttpclient/proxy/ProxyTest.java b/.../org/asynchttpclient/proxy/ProxyTest.java → .../org/asynchttpclient/proxy/ProxyTest.java
diff --git a/...httpclient/proxy/ProxyTunnellingTest.java → ...httpclient/proxy/ProxyTunnellingTest.java b/...httpclient/proxy/ProxyTunnellingTest.java → ...httpclient/proxy/ProxyTunnellingTest.java
diff --git a/...asynchttpclient/proxy/ProxyUtilsTest.java → ...asynchttpclient/proxy/ProxyUtilsTest.java b/...asynchttpclient/proxy/ProxyUtilsTest.java → ...asynchttpclient/proxy/ProxyUtilsTest.java
diff --git a/.../reactivestreams/ReactiveStreamsTest.java → .../reactivestreams/ReactiveStreamsTest.java b/.../reactivestreams/ReactiveStreamsTest.java → .../reactivestreams/ReactiveStreamsTest.java
diff --git a/...ttpclient/request/body/BodyChunkTest.java → ...ttpclient/request/body/BodyChunkTest.java b/...ttpclient/request/body/BodyChunkTest.java → ...ttpclient/request/body/BodyChunkTest.java
diff --git a/...httpclient/request/body/ChunkingTest.java → ...httpclient/request/body/ChunkingTest.java b/...httpclient/request/body/ChunkingTest.java → ...httpclient/request/body/ChunkingTest.java
diff --git a/...ttpclient/request/body/EmptyBodyTest.java → ...ttpclient/request/body/EmptyBodyTest.java b/...ttpclient/request/body/EmptyBodyTest.java → ...ttpclient/request/body/EmptyBodyTest.java
diff --git a/...uest/body/FastUnauthorizedUploadTest.java → ...uest/body/FastUnauthorizedUploadTest.java b/...uest/body/FastUnauthorizedUploadTest.java → ...uest/body/FastUnauthorizedUploadTest.java
diff --git a/...t/request/body/FilePartLargeFileTest.java → ...t/request/body/FilePartLargeFileTest.java b/...t/request/body/FilePartLargeFileTest.java → ...t/request/body/FilePartLargeFileTest.java
diff --git a/...pclient/request/body/InputStreamTest.java → ...pclient/request/body/InputStreamTest.java b/...pclient/request/body/InputStreamTest.java → ...pclient/request/body/InputStreamTest.java
diff --git a/...client/request/body/PutLargeFileTest.java → ...client/request/body/PutLargeFileTest.java b/...client/request/body/PutLargeFileTest.java → ...client/request/body/PutLargeFileTest.java
diff --git a/...ent/request/body/ReactiveStreamsTest.java → ...ent/request/body/ReactiveStreamsTest.java b/...ent/request/body/ReactiveStreamsTest.java → ...ent/request/body/ReactiveStreamsTest.java
diff --git a/...nt/request/body/TransferListenerTest.java → ...nt/request/body/TransferListenerTest.java b/...nt/request/body/TransferListenerTest.java → ...nt/request/body/TransferListenerTest.java
diff --git a/...client/request/body/ZeroCopyFileTest.java → ...client/request/body/ZeroCopyFileTest.java b/...client/request/body/ZeroCopyFileTest.java → ...client/request/body/ZeroCopyFileTest.java
diff --git a/.../generator/FeedableBodyGeneratorTest.java → .../generator/FeedableBodyGeneratorTest.java b/.../generator/FeedableBodyGeneratorTest.java → .../generator/FeedableBodyGeneratorTest.java
diff --git a/...enerators/ByteArrayBodyGeneratorTest.java → ...enerators/ByteArrayBodyGeneratorTest.java b/...enerators/ByteArrayBodyGeneratorTest.java → ...enerators/ByteArrayBodyGeneratorTest.java
diff --git a/...est/body/multipart/MultipartBodyTest.java → ...est/body/multipart/MultipartBodyTest.java b/...est/body/multipart/MultipartBodyTest.java → ...est/body/multipart/MultipartBodyTest.java
diff --git a/...t/body/multipart/MultipartUploadTest.java → ...t/body/multipart/MultipartUploadTest.java b/...t/body/multipart/MultipartUploadTest.java → ...t/body/multipart/MultipartUploadTest.java
diff --git a/.../SimpleAsyncClientErrorBehaviourTest.java → .../SimpleAsyncClientErrorBehaviourTest.java b/.../SimpleAsyncClientErrorBehaviourTest.java → .../SimpleAsyncClientErrorBehaviourTest.java
diff --git a/...ent/simple/SimpleAsyncHttpClientTest.java → ...ent/simple/SimpleAsyncHttpClientTest.java b/...ent/simple/SimpleAsyncHttpClientTest.java → ...ent/simple/SimpleAsyncHttpClientTest.java
diff --git a/...org/asynchttpclient/test/EchoHandler.java → ...org/asynchttpclient/test/EchoHandler.java b/...org/asynchttpclient/test/EchoHandler.java → ...org/asynchttpclient/test/EchoHandler.java
diff --git a/...tpclient/test/EventCollectingHandler.java → ...tpclient/test/EventCollectingHandler.java b/...tpclient/test/EventCollectingHandler.java → ...tpclient/test/EventCollectingHandler.java
diff --git a/...a/org/asynchttpclient/test/TestUtils.java → ...a/org/asynchttpclient/test/TestUtils.java b/...a/org/asynchttpclient/test/TestUtils.java → ...a/org/asynchttpclient/test/TestUtils.java
diff --git a/...java/org/asynchttpclient/uri/UriTest.java → ...java/org/asynchttpclient/uri/UriTest.java b/...java/org/asynchttpclient/uri/UriTest.java → ...java/org/asynchttpclient/uri/UriTest.java
diff --git a/...synchttpclient/util/TestUTF8UrlCodec.java → ...synchttpclient/util/TestUTF8UrlCodec.java b/...synchttpclient/util/TestUTF8UrlCodec.java → ...synchttpclient/util/TestUTF8UrlCodec.java
diff --git a/...ynchttpclient/webdav/WebDavBasicTest.java → ...ynchttpclient/webdav/WebDavBasicTest.java b/...ynchttpclient/webdav/WebDavBasicTest.java → ...ynchttpclient/webdav/WebDavBasicTest.java
diff --git a/...asynchttpclient/ws/AbstractBasicTest.java → ...asynchttpclient/ws/AbstractBasicTest.java b/...asynchttpclient/ws/AbstractBasicTest.java → ...asynchttpclient/ws/AbstractBasicTest.java
diff --git a/...g/asynchttpclient/ws/ByteMessageTest.java → ...g/asynchttpclient/ws/ByteMessageTest.java b/...g/asynchttpclient/ws/ByteMessageTest.java → ...g/asynchttpclient/ws/ByteMessageTest.java
diff --git a/...client/ws/CloseCodeReasonMessageTest.java → ...client/ws/CloseCodeReasonMessageTest.java b/...client/ws/CloseCodeReasonMessageTest.java → ...client/ws/CloseCodeReasonMessageTest.java
diff --git a/...va/org/asynchttpclient/ws/EchoSocket.java → ...va/org/asynchttpclient/ws/EchoSocket.java b/...va/org/asynchttpclient/ws/EchoSocket.java → ...va/org/asynchttpclient/ws/EchoSocket.java
diff --git a/...ynchttpclient/ws/ProxyTunnellingTest.java → ...ynchttpclient/ws/ProxyTunnellingTest.java b/...ynchttpclient/ws/ProxyTunnellingTest.java → ...ynchttpclient/ws/ProxyTunnellingTest.java
diff --git a/.../org/asynchttpclient/ws/RedirectTest.java → .../org/asynchttpclient/ws/RedirectTest.java b/.../org/asynchttpclient/ws/RedirectTest.java → .../org/asynchttpclient/ws/RedirectTest.java
diff --git a/...g/asynchttpclient/ws/TextMessageTest.java → ...g/asynchttpclient/ws/TextMessageTest.java b/...g/asynchttpclient/ws/TextMessageTest.java → ...g/asynchttpclient/ws/TextMessageTest.java
diff --git a/api/src/test/resources/300k.png → client/src/test/resources/300k.png b/api/src/test/resources/300k.png → client/src/test/resources/300k.png
diff --git a/api/src/test/resources/SimpleTextFile.txt → client/src/test/resources/SimpleTextFile.txt b/api/src/test/resources/SimpleTextFile.txt → client/src/test/resources/SimpleTextFile.txt
diff --git a/api/src/test/resources/client.keystore → client/src/test/resources/client.keystore b/api/src/test/resources/client.keystore → client/src/test/resources/client.keystore
diff --git a/api/src/test/resources/gzip.txt.gz → client/src/test/resources/gzip.txt.gz b/api/src/test/resources/gzip.txt.gz → client/src/test/resources/gzip.txt.gz
diff --git a/api/src/test/resources/logback-test.xml → client/src/test/resources/logback-test.xml b/api/src/test/resources/logback-test.xml → client/src/test/resources/logback-test.xml
diff --git a/api/src/test/resources/realm.properties → client/src/test/resources/realm.properties b/api/src/test/resources/realm.properties → client/src/test/resources/realm.properties
diff --git a/api/src/test/resources/ssltest-cacerts.jks → ...nt/src/test/resources/ssltest-cacerts.jks b/api/src/test/resources/ssltest-cacerts.jks → ...nt/src/test/resources/ssltest-cacerts.jks
diff --git a/api/src/test/resources/ssltest-keystore.jks → ...t/src/test/resources/ssltest-keystore.jks b/api/src/test/resources/ssltest-keystore.jks → ...t/src/test/resources/ssltest-keystore.jks
diff --git a/api/src/test/resources/textfile.txt → client/src/test/resources/textfile.txt b/api/src/test/resources/textfile.txt → client/src/test/resources/textfile.txt
diff --git a/api/src/test/resources/textfile2.txt → client/src/test/resources/textfile2.txt b/api/src/test/resources/textfile2.txt → client/src/test/resources/textfile2.txt
diff --git a/extras/pom.xml b/extras/pom.xml
@@ -51,12 +51,12 @@
     <dependencies>
         <dependency>
             <groupId>org.asynchttpclient</groupId>
-            <artifactId>async-http-client-api</artifactId>
+            <artifactId>async-http-client</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.asynchttpclient</groupId>
-            <artifactId>async-http-client-api</artifactId>
+            <artifactId>async-http-client</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
             <classifier>tests</classifier>

diff --git a/pom.xml b/pom.xml
@@ -321,7 +321,7 @@
 		</repository>
 	</repositories>
 	<modules>
-		<module>api</module>
+		<module>client</module>
 		<module>providers</module>
 		<module>extras</module>
 	</modules>

diff --git a/providers/pom.xml b/providers/pom.xml
@@ -49,12 +49,12 @@
     <dependencies>
         <dependency>
             <groupId>org.asynchttpclient</groupId>
-            <artifactId>async-http-client-api</artifactId>
+            <artifactId>async-http-client</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.asynchttpclient</groupId>
-            <artifactId>async-http-client-api</artifactId>
+            <artifactId>async-http-client</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
             <classifier>tests</classifier>