diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
new file mode 100644
index 000000000..a8b2328f0
--- /dev/null
+++ b/docker-java-api/pom.xml
@@ -0,0 +1,63 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.github.docker-java</groupId>
+		<artifactId>docker-java-parent</artifactId>
+		<version>3.1.6-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>docker-java-api</artifactId>
+	<packaging>bundle</packaging>
+
+	<name>docker-java-api</name>
+	<url>https://github.com/docker-java/docker-java</url>
+	<description>Java API Client for Docker</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>${commons-lang.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>${commons-codec.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>${guava.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.google.code.findbugs</groupId>
+			<artifactId>annotations</artifactId>
+			<version>3.0.1u2</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Export-Package>com.github.dockerjava.api.*</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/DockerClient.java b/docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/DockerClient.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/DockerClient.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/async/ResultCallback.java b/docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallback.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/AsyncDockerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/AuthCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/AuthCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CommitCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CommitCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ConnectToNetworkCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ContainerDiffCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyArchiveFromContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyArchiveToContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CopyFileFromContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateContainerResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateImageResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateNetworkResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateSecretResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateServiceResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/CreateVolumeResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/DisconnectFromNetworkCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdAsyncExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdExecFactory.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmdSyncExec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdSyncExec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/DockerCmdSyncExec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/DockerCmdSyncExec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/EventsCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecCreateCmdResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ExecStartCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/GraphData.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/GraphData.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphData.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/GraphDriver.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/GraphDriver.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/HealthState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/HealthState.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthState.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/HealthStateLog.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InfoCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InfoCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InitializeSwarmCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InitializeSwarmCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InitializeSwarmCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InitializeSwarmCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectExecResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectImageResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectNetworkCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectServiceCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectServiceCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectServiceCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectServiceCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectSwarmCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectSwarmCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectSwarmCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectSwarmCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectSwarmNodeCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectTaskCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectTaskCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectTaskCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectTaskCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/InspectVolumeResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/JoinSwarmCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/JoinSwarmCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/JoinSwarmCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/JoinSwarmCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/KillContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/LeaveSwarmCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LeaveSwarmCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/LeaveSwarmCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/LeaveSwarmCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ListImagesCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ListNetworksCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ListSecretsCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ListServicesCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ListSwarmNodesCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ListTasksCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListTasksCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ListTasksCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ListTasksCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/ListVolumesResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/LoadImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/LoadImageCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/LoadImageCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/LogSwarmObjectCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LogSwarmObjectCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/LogSwarmObjectCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/LogSwarmObjectCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/PauseContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/PingCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PingCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/PingCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/PingCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/PruneCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PruneCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/PruneCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/PruneCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/PullImageCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/PushImageCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveImageCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveNetworkCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/RemoveSecretCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSecretCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/RemoveSecretCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSecretCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/RemoveServiceCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveServiceCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/RemoveServiceCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveServiceCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveSwarmNodeCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/RemoveVolumeCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/RenameContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/RestartContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/RootFS.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/RootFS.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/RootFS.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/SaveImageCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/SearchImagesCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/StartContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/StatsCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/StatsCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/StopContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/SyncDockerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/TagImageCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/TopContainerResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/UnpauseContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateServiceCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/UpdateSwarmCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateSwarmCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/UpdateSwarmCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateSwarmCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/UpdateSwarmNodeCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/VersionCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/VersionCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/command/WaitContainerCmd.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/exception/BadRequestException.java b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/BadRequestException.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/exception/BadRequestException.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/exception/BadRequestException.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/exception/ConflictException.java b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/ConflictException.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/exception/ConflictException.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/exception/ConflictException.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/exception/DockerClientException.java b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/DockerClientException.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/exception/DockerClientException.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/exception/DockerClientException.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/exception/DockerException.java b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/DockerException.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/exception/DockerException.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/exception/DockerException.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/exception/InternalServerErrorException.java b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/InternalServerErrorException.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/exception/InternalServerErrorException.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/exception/InternalServerErrorException.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/exception/NotAcceptableException.java b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/NotAcceptableException.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/exception/NotAcceptableException.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/exception/NotAcceptableException.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/exception/NotFoundException.java b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/NotFoundException.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/exception/NotFoundException.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/exception/NotFoundException.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/exception/NotModifiedException.java b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/NotModifiedException.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/exception/NotModifiedException.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/exception/NotModifiedException.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/exception/UnauthorizedException.java b/docker-java-api/src/main/java/com/github/dockerjava/api/exception/UnauthorizedException.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/exception/UnauthorizedException.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/exception/UnauthorizedException.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/AccessMode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AccessMode.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/AccessMode.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/AccessMode.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthConfigurations.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/AuthResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/AuthResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Bind.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Bind.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Bind.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/BindOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/BindOptions.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/BindOptions.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/BindPropagation.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BindPropagation.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/BindPropagation.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/BindPropagation.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Binds.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Binds.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Binds.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioRateDevice.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatEntry.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioStatsConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/BlkioWeightDevice.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/BuildResponseItem.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Capability.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Capability.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ChangeLog.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ChangeLog.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ClusterInfo.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Container.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Container.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Container.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerDNSConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerHostConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerMount.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerMount.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetwork.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerNetworkSettings.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerPort.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerPort.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecFile.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivileges.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesCredential.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecPrivilegesSELinuxContext.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ContainerSpecSecret.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuStatsConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/CpuUsageConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Device.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Device.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Device.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Driver.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Driver.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Driver.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/DriverStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/DriverStatus.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Endpoint.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Endpoint.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Endpoint.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointResolutionMode.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointSpec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/EndpointVirtualIP.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorDetail.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ErrorResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Event.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Event.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Event.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/EventActor.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventActor.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/EventActor.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/EventActor.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/EventType.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/EventType.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/EventType.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/EventType.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ExposedPort.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPort.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ExposedPorts.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ExternalCA.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCA.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ExternalCAProtocol.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Frame.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Frame.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Frame.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Frame.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/GenericResource.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/GenericResource.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/GenericResource.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/GenericResource.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/HealthCheck.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/HealthCheck.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/HostConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/HostConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Identifier.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Identifier.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Identifier.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Image.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Image.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Image.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Info.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Info.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Info.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/InfoRegistryConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/InternetProtocol.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Isolation.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Isolation.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Isolation.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Isolation.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Link.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Link.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Link.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Link.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Links.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Links.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Links.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/LocalNodeState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LocalNodeState.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/LocalNodeState.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/LocalNodeState.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/LogConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/LogConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/LogConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/LxcConf.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/LxcConf.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/LxcConf.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/MemoryStatsConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Mount.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Mount.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Mount.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/MountType.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/MountType.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/MountType.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Network.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Network.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Network.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkAttachmentConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/NetworkSettings.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Node.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Node.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Node.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ObjectVersion.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/PeerNode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/PeerNode.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/PeerNode.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/PidsStatsConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/PortBinding.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortBinding.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/PortBinding.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/PortBinding.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/PortConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/PortConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/PortConfigProtocol.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Ports.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Ports.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Ports.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/PropagationMode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PropagationMode.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/PropagationMode.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/PropagationMode.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/PruneResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/PruneResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/PruneType.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneType.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/PruneType.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/PruneType.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/PushResponseItem.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Reachability.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Reachability.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Reachability.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Reachability.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Repository.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Repository.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Repository.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceRequirements.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceVersion.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ResponseItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ResponseItem.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SELContext.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SELContext.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SELContext.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SELContext.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SearchItem.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SearchItem.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SearchItem.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Secret.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Secret.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Secret.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SecretSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SecretSpec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Service.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Service.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Service.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceGlobalModeOptions.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceMode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceMode.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ServiceMode.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceMode.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceModeConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ServicePlacement.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceReplicatedModeOptions.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartCondition.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceRestartPolicy.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceSpec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateState.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ServiceUpdateStatus.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/StatisticNetworksConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Statistics.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Statistics.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Statistics.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/StatsConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/StatsConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/StatsConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/StreamType.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/StreamType.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/StreamType.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/StreamType.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Swarm.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Swarm.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Swarm.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Swarm.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmCAConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmDispatcherConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmInfo.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmJoinTokens.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNode.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNode.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeAvailability.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeDescription.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeEngineDescription.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeManagerStatus.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePlatform.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodePluginDescription.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeResources.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeRole.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeSpec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeState.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeState.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeState.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeStatus.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmNodeVersion.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmOrchestration.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmRaftConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmSpec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/SwarmVersion.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Task.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Task.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Task.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskDefaults.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/TaskSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskSpec.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/TaskState.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskState.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/TaskState.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskState.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/TaskStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatus.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/TaskStatusContainerStatus.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/ThrottlingDataConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/TmpfsOptions.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Ulimit.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Ulimit.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Ulimit.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateContainerResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateFailureAction.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/UpdateOrder.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateOrder.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/UpdateOrder.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/UpdateOrder.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Version.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Version.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Version.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/VersionComponent.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionComponent.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/VersionPlatform.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Volume.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Volume.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Volume.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/VolumeBind.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBind.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/VolumeBind.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBind.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeOptions.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/VolumeRW.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumeRW.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/Volumes.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/Volumes.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/Volumes.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesFrom.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/VolumesRW.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/VolumesRW.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/api/model/WaitResponse.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
rename to docker-java-api/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/docker-java-api/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
rename to docker-java-api/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
diff --git a/docker-java/src/main/java/com/github/dockerjava/core/SSLConfig.java b/docker-java-api/src/main/java/com/github/dockerjava/core/SSLConfig.java
similarity index 100%
rename from docker-java/src/main/java/com/github/dockerjava/core/SSLConfig.java
rename to docker-java-api/src/main/java/com/github/dockerjava/core/SSLConfig.java
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index b9fede875..5a5cc22c2 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -16,6 +16,11 @@
 	<description>Java API Client for Docker</description>
 
 	<dependencies>
+		<dependency>
+			<groupId>${groupId}</groupId>
+			<artifactId>docker-java-api</artifactId>
+			<version>${version}</version>
+		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.jaxrs</groupId>
 			<artifactId>jackson-jaxrs-json-provider</artifactId>
diff --git a/pom.xml b/pom.xml
index 46d1cfefe..edc09f0dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,9 +58,10 @@
 		<jdk.target>1.7</jdk.target>
 
 		<jersey.version>2.27</jersey.version>
+		<jackson.version>2.9.8</jackson.version>
 		<jackson-jaxrs.version>2.9.8</jackson-jaxrs.version>
 		<httpclient.version>4.5.6</httpclient.version><!-- 4.5.1-4.5.2 broken -->
-		<commons-compress.version>1.18</commons-compress.version>
+		<commons-compress.version>1.19</commons-compress.version>
 		<commons-codec.version>1.11</commons-codec.version>
 		<commons-io.version>2.6</commons-io.version>
 		<commons-lang.version>2.6</commons-lang.version>
@@ -90,6 +91,7 @@
 	</properties>
 
 	<modules>
+		<module>docker-java-api</module>
 		<module>docker-java</module>
 	</modules>
 
@@ -283,7 +285,7 @@
 							<failOnViolation>true</failOnViolation>
 							<logViolationsToConsole>true</logViolationsToConsole>
 							<linkXRef>false</linkXRef>
-							<!-- if some IDE has integration and requires other place, propose 
+							<!-- if some IDE has integration and requires other place, propose
 								it -->
 							<configLocation>
 								${maven.multiModuleProjectDirectory}/src/test/resources/checkstyle/checkstyle-config.xml