diff --git a/README.md b/README.md
index 0065aea5262..640140aaa5b 100644
--- a/README.md
+++ b/README.md
@@ -100,14 +100,14 @@ Service myservice = client.services().inNamespace("default").withName("myservice
 In the same spirit you can inline builders to create:
 
 ```java
-Namespace myns = client.namespaces().create()
+Namespace myns = client.namespaces().createNew()
                    .editMetadata()
                      .withName("myns")
                      .addToLabels("a", "label")
                    .endMetadata()
                    .done();
 
-Service myservice = client.services().inNamespace("default").create()A
+Service myservice = client.services().inNamespace("default").createNew()
                      .editMetadata()
                        .withName("myservice")
                        .addToLabels("another", "label")
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/BuilderUpdate.java b/src/main/java/io/fabric8/kubernetes/client/BuilderUpdate.java
similarity index 83%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/BuilderUpdate.java
rename to src/main/java/io/fabric8/kubernetes/client/BuilderUpdate.java
index 827a37fa454..7fa38a26f2a 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/BuilderUpdate.java
+++ b/src/main/java/io/fabric8/kubernetes/client/BuilderUpdate.java
@@ -1,4 +1,4 @@
-package io.fabric8.kubernetes.client.dsl;
+package io.fabric8.kubernetes.client;
 
 import io.fabric8.kubernetes.api.builder.Builder;
 import io.fabric8.kubernetes.api.model.HasMetadata;
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/DefaultKubernetesClient.java b/src/main/java/io/fabric8/kubernetes/client/DefaultKubernetesClient.java
similarity index 82%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/DefaultKubernetesClient.java
rename to src/main/java/io/fabric8/kubernetes/client/DefaultKubernetesClient.java
index 831a2bd675c..e0e5f8cfeda 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/DefaultKubernetesClient.java
+++ b/src/main/java/io/fabric8/kubernetes/client/DefaultKubernetesClient.java
@@ -1,4 +1,4 @@
-package io.fabric8.kubernetes.client.dsl;
+package io.fabric8.kubernetes.client;
 
 import com.ning.http.client.AsyncHttpClient;
 import com.ning.http.client.AsyncHttpClientConfig;
@@ -7,8 +7,8 @@
 import com.ning.http.client.filter.FilterException;
 import com.ning.http.client.filter.RequestFilter;
 import io.fabric8.kubernetes.api.model.*;
-import io.fabric8.kubernetes.client.dsl.internal.KubeConfigUtils;
-import io.fabric8.kubernetes.client.dsl.internal.Utils;
+import io.fabric8.kubernetes.client.internal.KubeConfigUtils;
+import io.fabric8.kubernetes.client.internal.Utils;
 import io.fabric8.openshift.api.model.*;
 import org.jboss.netty.handler.ssl.util.InsecureTrustManagerFactory;
 import org.slf4j.Logger;
@@ -142,97 +142,97 @@ public void close() {
 
   @Override
   public NamespaceAwareResourceList<Endpoints, EndpointsList, EndpointsBuilder, DoneableEndpoints> endpoints() {
-    return new io.fabric8.kubernetes.client.dsl.internal.NamespaceAwareResourceList<>(httpClient, masterUrl, "endpoints", Endpoints.class, EndpointsList.class, EndpointsBuilder.class, DoneableEndpoints.class);
+    return new io.fabric8.kubernetes.client.internal.NamespaceAwareResourceList<>(httpClient, masterUrl, "endpoints", Endpoints.class, EndpointsList.class, EndpointsBuilder.class, DoneableEndpoints.class);
   }
 
   @Override
   public NamespaceAwareResourceList<Event, EventList, EventBuilder, DoneableEvent> events() {
-    return new io.fabric8.kubernetes.client.dsl.internal.NamespaceAwareResourceList<>(httpClient, masterUrl, "events", Event.class, EventList.class, EventBuilder.class, DoneableEvent.class);
+    return new io.fabric8.kubernetes.client.internal.NamespaceAwareResourceList<>(httpClient, masterUrl, "events", Event.class, EventList.class, EventBuilder.class, DoneableEvent.class);
   }
 
   @Override
   public NonNamespacedResourceList<Namespace, NamespaceList, NamespaceBuilder, DoneableNamespace> namespaces() {
-    return new io.fabric8.kubernetes.client.dsl.internal.NonNamespacedResourceList<>(httpClient, masterUrl, "namespaces", Namespace.class, NamespaceList.class, NamespaceBuilder.class, DoneableNamespace.class);
+    return new io.fabric8.kubernetes.client.internal.NonNamespacedResourceList<>(httpClient, masterUrl, "namespaces", Namespace.class, NamespaceList.class, NamespaceBuilder.class, DoneableNamespace.class);
   }
 
   @Override
   public NonNamespacedResourceList<Node, NodeList, NodeBuilder, DoneableNode> nodes() {
-    return new io.fabric8.kubernetes.client.dsl.internal.NonNamespacedResourceList<>(httpClient, masterUrl, "nodes", Node.class, NodeList.class, NodeBuilder.class, DoneableNode.class);
+    return new io.fabric8.kubernetes.client.internal.NonNamespacedResourceList<>(httpClient, masterUrl, "nodes", Node.class, NodeList.class, NodeBuilder.class, DoneableNode.class);
   }
 
   @Override
   public NamespaceAwareResourceList<PersistentVolume, PersistentVolumeList, PersistentVolumeBuilder, DoneablePersistentVolume> persistentVolumes() {
-    return new io.fabric8.kubernetes.client.dsl.internal.NamespaceAwareResourceList<>(httpClient, masterUrl, "persistentvolumes", PersistentVolume.class, PersistentVolumeList.class, PersistentVolumeBuilder.class, DoneablePersistentVolume.class);
+    return new io.fabric8.kubernetes.client.internal.NamespaceAwareResourceList<>(httpClient, masterUrl, "persistentvolumes", PersistentVolume.class, PersistentVolumeList.class, PersistentVolumeBuilder.class, DoneablePersistentVolume.class);
   }
 
   @Override
   public NamespaceAwareResourceList<PersistentVolumeClaim, PersistentVolumeClaimList, PersistentVolumeClaimBuilder, DoneablePersistentVolumeClaim> persistentVolumeClaims() {
-    return new io.fabric8.kubernetes.client.dsl.internal.NamespaceAwareResourceList<>(httpClient, masterUrl, "persistentvolumeclaims", PersistentVolumeClaim.class, PersistentVolumeClaimList.class, PersistentVolumeClaimBuilder.class, DoneablePersistentVolumeClaim.class);
+    return new io.fabric8.kubernetes.client.internal.NamespaceAwareResourceList<>(httpClient, masterUrl, "persistentvolumeclaims", PersistentVolumeClaim.class, PersistentVolumeClaimList.class, PersistentVolumeClaimBuilder.class, DoneablePersistentVolumeClaim.class);
   }
 
   @Override
   public NamespaceAwareResourceList<Pod, PodList, PodBuilder, DoneablePod> pods() {
-    return new io.fabric8.kubernetes.client.dsl.internal.NamespaceAwareResourceList<>(httpClient, masterUrl, "pods", Pod.class, PodList.class, PodBuilder.class, DoneablePod.class);
+    return new io.fabric8.kubernetes.client.internal.NamespaceAwareResourceList<>(httpClient, masterUrl, "pods", Pod.class, PodList.class, PodBuilder.class, DoneablePod.class);
   }
 
   @Override
   public NamespaceAwareResourceList<ReplicationController, ReplicationControllerList, ReplicationControllerBuilder, DoneableReplicationController> replicationControllers() {
-    return new io.fabric8.kubernetes.client.dsl.internal.NamespaceAwareResourceList<>(httpClient, masterUrl, "replicationcontrollers", ReplicationController.class, ReplicationControllerList.class, ReplicationControllerBuilder.class, DoneableReplicationController.class);
+    return new io.fabric8.kubernetes.client.internal.NamespaceAwareResourceList<>(httpClient, masterUrl, "replicationcontrollers", ReplicationController.class, ReplicationControllerList.class, ReplicationControllerBuilder.class, DoneableReplicationController.class);
   }
 
   @Override
   public NamespaceAwareResourceList<ResourceQuota, ResourceQuotaList, ResourceQuotaBuilder, DoneableResourceQuota> resourceQuotas() {
-    return new io.fabric8.kubernetes.client.dsl.internal.NamespaceAwareResourceList<>(httpClient, masterUrl, "resourcequotas", ResourceQuota.class, ResourceQuotaList.class, ResourceQuotaBuilder.class, DoneableResourceQuota.class);
+    return new io.fabric8.kubernetes.client.internal.NamespaceAwareResourceList<>(httpClient, masterUrl, "resourcequotas", ResourceQuota.class, ResourceQuotaList.class, ResourceQuotaBuilder.class, DoneableResourceQuota.class);
   }
 
   @Override
   public NamespaceAwareResourceList<Secret, SecretList, SecretBuilder, DoneableSecret> secrets() {
-    return new io.fabric8.kubernetes.client.dsl.internal.NamespaceAwareResourceList<>(httpClient, masterUrl, "secrets", Secret.class, SecretList.class, SecretBuilder.class, DoneableSecret.class);
+    return new io.fabric8.kubernetes.client.internal.NamespaceAwareResourceList<>(httpClient, masterUrl, "secrets", Secret.class, SecretList.class, SecretBuilder.class, DoneableSecret.class);
   }
 
   @Override
   public NamespaceAwareResourceList<Service, ServiceList, ServiceBuilder, DoneableService> services() {
-    return new io.fabric8.kubernetes.client.dsl.internal.NamespaceAwareResourceList<>(httpClient, masterUrl, "services", Service.class, ServiceList.class, ServiceBuilder.class, DoneableService.class);
+    return new io.fabric8.kubernetes.client.internal.NamespaceAwareResourceList<>(httpClient, masterUrl, "services", Service.class, ServiceList.class, ServiceBuilder.class, DoneableService.class);
   }
 
   @Override
   public NamespaceAwareResourceList<ServiceAccount, ServiceAccountList, ServiceAccountBuilder, DoneableServiceAccount> serviceAccounts() {
-    return new io.fabric8.kubernetes.client.dsl.internal.NamespaceAwareResourceList<>(httpClient, masterUrl, "serviceaccounts", ServiceAccount.class, ServiceAccountList.class, ServiceAccountBuilder.class, DoneableServiceAccount.class);
+    return new io.fabric8.kubernetes.client.internal.NamespaceAwareResourceList<>(httpClient, masterUrl, "serviceaccounts", ServiceAccount.class, ServiceAccountList.class, ServiceAccountBuilder.class, DoneableServiceAccount.class);
   }
 
   @Override
   public NamespaceAwareResourceList<BuildConfig, BuildConfigList, BuildConfigBuilder, DoneableBuildConfig> buildConfigs() {
-    return new io.fabric8.kubernetes.client.dsl.internal.NamespaceAwareResourceList<>(httpClient, openShiftUrl, "buildconfigs", BuildConfig.class, BuildConfigList.class, BuildConfigBuilder.class, DoneableBuildConfig.class);
+    return new io.fabric8.kubernetes.client.internal.NamespaceAwareResourceList<>(httpClient, openShiftUrl, "buildconfigs", BuildConfig.class, BuildConfigList.class, BuildConfigBuilder.class, DoneableBuildConfig.class);
   }
 
   @Override
   public NamespaceAwareResourceList<DeploymentConfig, DeploymentConfigList, DeploymentConfigBuilder, DoneableDeploymentConfig> deploymentConfigs() {
-    return new io.fabric8.kubernetes.client.dsl.internal.NamespaceAwareResourceList<>(httpClient, openShiftUrl, "deploymentconfigs", DeploymentConfig.class, DeploymentConfigList.class, DeploymentConfigBuilder.class, DoneableDeploymentConfig.class);
+    return new io.fabric8.kubernetes.client.internal.NamespaceAwareResourceList<>(httpClient, openShiftUrl, "deploymentconfigs", DeploymentConfig.class, DeploymentConfigList.class, DeploymentConfigBuilder.class, DoneableDeploymentConfig.class);
   }
 
   @Override
   public NamespaceAwareResourceList<ImageStream, ImageStreamList, ImageStreamBuilder, DoneableImageStream> imageStreams() {
-    return new io.fabric8.kubernetes.client.dsl.internal.NamespaceAwareResourceList<>(httpClient, openShiftUrl, "imagestreams", ImageStream.class, ImageStreamList.class, ImageStreamBuilder.class, DoneableImageStream.class);
+    return new io.fabric8.kubernetes.client.internal.NamespaceAwareResourceList<>(httpClient, openShiftUrl, "imagestreams", ImageStream.class, ImageStreamList.class, ImageStreamBuilder.class, DoneableImageStream.class);
   }
 
   @Override
   public NonNamespacedResourceList<OAuthAccessToken, OAuthAccessTokenList, OAuthAccessTokenBuilder, DoneableOAuthAccessToken> oAuthAccessTokens() {
-    return new io.fabric8.kubernetes.client.dsl.internal.NonNamespacedResourceList<>(httpClient, openShiftUrl, "oauthaccesstokens", OAuthAccessToken.class, OAuthAccessTokenList.class, OAuthAccessTokenBuilder.class, DoneableOAuthAccessToken.class);
+    return new io.fabric8.kubernetes.client.internal.NonNamespacedResourceList<>(httpClient, openShiftUrl, "oauthaccesstokens", OAuthAccessToken.class, OAuthAccessTokenList.class, OAuthAccessTokenBuilder.class, DoneableOAuthAccessToken.class);
   }
 
   @Override
   public NonNamespacedResourceList<OAuthAuthorizeToken, OAuthAuthorizeTokenList, OAuthAuthorizeTokenBuilder, DoneableOAuthAuthorizeToken> oAuthAuthorizeTokens() {
-    return new io.fabric8.kubernetes.client.dsl.internal.NonNamespacedResourceList<>(httpClient, openShiftUrl, "oauthauthorizetokens", OAuthAuthorizeToken.class, OAuthAuthorizeTokenList.class, OAuthAuthorizeTokenBuilder.class, DoneableOAuthAuthorizeToken.class);
+    return new io.fabric8.kubernetes.client.internal.NonNamespacedResourceList<>(httpClient, openShiftUrl, "oauthauthorizetokens", OAuthAuthorizeToken.class, OAuthAuthorizeTokenList.class, OAuthAuthorizeTokenBuilder.class, DoneableOAuthAuthorizeToken.class);
   }
 
   @Override
   public NonNamespacedResourceList<OAuthClient, OAuthClientList, OAuthClientBuilder, DoneableOAuthClient> oAuthClients() {
-    return new io.fabric8.kubernetes.client.dsl.internal.NonNamespacedResourceList<>(httpClient, openShiftUrl, "oauthclients", OAuthClient.class, OAuthClientList.class, OAuthClientBuilder.class, DoneableOAuthClient.class);
+    return new io.fabric8.kubernetes.client.internal.NonNamespacedResourceList<>(httpClient, openShiftUrl, "oauthclients", OAuthClient.class, OAuthClientList.class, OAuthClientBuilder.class, DoneableOAuthClient.class);
   }
 
   @Override
   public NamespaceAwareResourceList<Route, RouteList, RouteBuilder, DoneableRoute> routes() {
-    return new io.fabric8.kubernetes.client.dsl.internal.NamespaceAwareResourceList<>(httpClient, openShiftUrl, "routes", Route.class, RouteList.class, RouteBuilder.class, DoneableRoute.class);
+    return new io.fabric8.kubernetes.client.internal.NamespaceAwareResourceList<>(httpClient, openShiftUrl, "routes", Route.class, RouteList.class, RouteBuilder.class, DoneableRoute.class);
   }
 
   public static class Config {
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/FilteredNamespacedResourceList.java b/src/main/java/io/fabric8/kubernetes/client/FilteredNamespacedResourceList.java
similarity index 94%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/FilteredNamespacedResourceList.java
rename to src/main/java/io/fabric8/kubernetes/client/FilteredNamespacedResourceList.java
index 2b10df0c0be..21dafb3cfc2 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/FilteredNamespacedResourceList.java
+++ b/src/main/java/io/fabric8/kubernetes/client/FilteredNamespacedResourceList.java
@@ -1,4 +1,4 @@
-package io.fabric8.kubernetes.client.dsl;
+package io.fabric8.kubernetes.client;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/FilteredResourceList.java b/src/main/java/io/fabric8/kubernetes/client/FilteredResourceList.java
similarity index 94%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/FilteredResourceList.java
rename to src/main/java/io/fabric8/kubernetes/client/FilteredResourceList.java
index d518a5712dd..be46fa7c8c5 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/FilteredResourceList.java
+++ b/src/main/java/io/fabric8/kubernetes/client/FilteredResourceList.java
@@ -1,4 +1,4 @@
-package io.fabric8.kubernetes.client.dsl;
+package io.fabric8.kubernetes.client;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/KubernetesClient.java b/src/main/java/io/fabric8/kubernetes/client/KubernetesClient.java
similarity index 99%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/KubernetesClient.java
rename to src/main/java/io/fabric8/kubernetes/client/KubernetesClient.java
index 73b787a66c4..fd4589185dd 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/KubernetesClient.java
+++ b/src/main/java/io/fabric8/kubernetes/client/KubernetesClient.java
@@ -1,4 +1,4 @@
-package io.fabric8.kubernetes.client.dsl;
+package io.fabric8.kubernetes.client;
 
 import io.fabric8.kubernetes.api.model.DoneableEndpoints;
 import io.fabric8.kubernetes.api.model.DoneableEvent;
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/KubernetesClientException.java b/src/main/java/io/fabric8/kubernetes/client/KubernetesClientException.java
similarity index 93%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/KubernetesClientException.java
rename to src/main/java/io/fabric8/kubernetes/client/KubernetesClientException.java
index b83a13285b5..2d811a190d3 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/KubernetesClientException.java
+++ b/src/main/java/io/fabric8/kubernetes/client/KubernetesClientException.java
@@ -1,4 +1,4 @@
-package io.fabric8.kubernetes.client.dsl;
+package io.fabric8.kubernetes.client;
 
 import io.fabric8.kubernetes.api.model.Status;
 
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/NamedNamespacedResource.java b/src/main/java/io/fabric8/kubernetes/client/NamedNamespacedResource.java
similarity index 92%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/NamedNamespacedResource.java
rename to src/main/java/io/fabric8/kubernetes/client/NamedNamespacedResource.java
index 98b410139d7..2578c7c7bef 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/NamedNamespacedResource.java
+++ b/src/main/java/io/fabric8/kubernetes/client/NamedNamespacedResource.java
@@ -1,4 +1,4 @@
-package io.fabric8.kubernetes.client.dsl;
+package io.fabric8.kubernetes.client;
 
 import io.fabric8.kubernetes.api.builder.Builder;
 import io.fabric8.kubernetes.api.model.Doneable;
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/NamedResource.java b/src/main/java/io/fabric8/kubernetes/client/NamedResource.java
similarity index 92%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/NamedResource.java
rename to src/main/java/io/fabric8/kubernetes/client/NamedResource.java
index f7ccd034f3d..07745341840 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/NamedResource.java
+++ b/src/main/java/io/fabric8/kubernetes/client/NamedResource.java
@@ -1,4 +1,4 @@
-package io.fabric8.kubernetes.client.dsl;
+package io.fabric8.kubernetes.client;
 
 import io.fabric8.kubernetes.api.builder.Builder;
 import io.fabric8.kubernetes.api.model.Doneable;
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/NamespaceAwareResourceList.java b/src/main/java/io/fabric8/kubernetes/client/NamespaceAwareResourceList.java
similarity index 91%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/NamespaceAwareResourceList.java
rename to src/main/java/io/fabric8/kubernetes/client/NamespaceAwareResourceList.java
index c756f103e81..7c61421e292 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/NamespaceAwareResourceList.java
+++ b/src/main/java/io/fabric8/kubernetes/client/NamespaceAwareResourceList.java
@@ -1,4 +1,4 @@
-package io.fabric8.kubernetes.client.dsl;
+package io.fabric8.kubernetes.client;
 
 import io.fabric8.kubernetes.api.builder.Builder;
 import io.fabric8.kubernetes.api.model.Doneable;
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/NamespacedResourceList.java b/src/main/java/io/fabric8/kubernetes/client/NamespacedResourceList.java
similarity index 96%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/NamespacedResourceList.java
rename to src/main/java/io/fabric8/kubernetes/client/NamespacedResourceList.java
index 6eaa399c7ea..b09a1bbca52 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/NamespacedResourceList.java
+++ b/src/main/java/io/fabric8/kubernetes/client/NamespacedResourceList.java
@@ -1,4 +1,4 @@
-package io.fabric8.kubernetes.client.dsl;
+package io.fabric8.kubernetes.client;
 
 import com.ning.http.client.ws.WebSocket;
 import io.fabric8.kubernetes.api.builder.Builder;
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/NonNamespacedResourceList.java b/src/main/java/io/fabric8/kubernetes/client/NonNamespacedResourceList.java
similarity index 93%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/NonNamespacedResourceList.java
rename to src/main/java/io/fabric8/kubernetes/client/NonNamespacedResourceList.java
index b10babd0538..d121464eaa4 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/NonNamespacedResourceList.java
+++ b/src/main/java/io/fabric8/kubernetes/client/NonNamespacedResourceList.java
@@ -1,4 +1,4 @@
-package io.fabric8.kubernetes.client.dsl;
+package io.fabric8.kubernetes.client;
 
 import io.fabric8.kubernetes.api.builder.Builder;
 import io.fabric8.kubernetes.api.model.Doneable;
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/OpenShiftClient.java b/src/main/java/io/fabric8/kubernetes/client/OpenShiftClient.java
similarity index 95%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/OpenShiftClient.java
rename to src/main/java/io/fabric8/kubernetes/client/OpenShiftClient.java
index b9f5b71da55..19c482e6390 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/OpenShiftClient.java
+++ b/src/main/java/io/fabric8/kubernetes/client/OpenShiftClient.java
@@ -1,4 +1,4 @@
-package io.fabric8.kubernetes.client.dsl;
+package io.fabric8.kubernetes.client;
 
 import io.fabric8.openshift.api.model.*;
 
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/ResourceList.java b/src/main/java/io/fabric8/kubernetes/client/ResourceList.java
similarity index 94%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/ResourceList.java
rename to src/main/java/io/fabric8/kubernetes/client/ResourceList.java
index 62e92492141..b654cb855fd 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/ResourceList.java
+++ b/src/main/java/io/fabric8/kubernetes/client/ResourceList.java
@@ -1,4 +1,4 @@
-package io.fabric8.kubernetes.client.dsl;
+package io.fabric8.kubernetes.client;
 
 import com.ning.http.client.ws.WebSocket;
 import io.fabric8.kubernetes.api.builder.Builder;
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/Update.java b/src/main/java/io/fabric8/kubernetes/client/Update.java
similarity index 75%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/Update.java
rename to src/main/java/io/fabric8/kubernetes/client/Update.java
index 4dd1b1f2d82..3a1e4ab7060 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/Update.java
+++ b/src/main/java/io/fabric8/kubernetes/client/Update.java
@@ -1,4 +1,4 @@
-package io.fabric8.kubernetes.client.dsl;
+package io.fabric8.kubernetes.client;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/Watcher.java b/src/main/java/io/fabric8/kubernetes/client/Watcher.java
similarity index 77%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/Watcher.java
rename to src/main/java/io/fabric8/kubernetes/client/Watcher.java
index 01f825658c7..a073f8e0580 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/Watcher.java
+++ b/src/main/java/io/fabric8/kubernetes/client/Watcher.java
@@ -1,4 +1,4 @@
-package io.fabric8.kubernetes.client.dsl;
+package io.fabric8.kubernetes.client;
 
 public interface Watcher<T> {
 
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/internal/BaseResource.java b/src/main/java/io/fabric8/kubernetes/client/internal/BaseResource.java
similarity index 97%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/internal/BaseResource.java
rename to src/main/java/io/fabric8/kubernetes/client/internal/BaseResource.java
index e0d25a0dadc..a9cd562e17c 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/internal/BaseResource.java
+++ b/src/main/java/io/fabric8/kubernetes/client/internal/BaseResource.java
@@ -1,4 +1,4 @@
-package io.fabric8.kubernetes.client.dsl.internal;
+package io.fabric8.kubernetes.client.internal;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ning.http.client.AsyncHttpClient;
@@ -7,7 +7,7 @@
 import io.fabric8.kubernetes.api.model.Doneable;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.Status;
-import io.fabric8.kubernetes.client.dsl.KubernetesClientException;
+import io.fabric8.kubernetes.client.KubernetesClientException;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/internal/BaseResourceList.java b/src/main/java/io/fabric8/kubernetes/client/internal/BaseResourceList.java
similarity index 97%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/internal/BaseResourceList.java
rename to src/main/java/io/fabric8/kubernetes/client/internal/BaseResourceList.java
index e6e389a20f0..4f84a57b095 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/internal/BaseResourceList.java
+++ b/src/main/java/io/fabric8/kubernetes/client/internal/BaseResourceList.java
@@ -1,4 +1,4 @@
-package io.fabric8.kubernetes.client.dsl.internal;
+package io.fabric8.kubernetes.client.internal;
 
 import com.ning.http.client.AsyncHttpClient;
 import com.ning.http.client.Response;
@@ -11,8 +11,8 @@
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 import io.fabric8.kubernetes.api.model.Status;
 import io.fabric8.kubernetes.api.model.WatchEvent;
-import io.fabric8.kubernetes.client.dsl.KubernetesClientException;
-import io.fabric8.kubernetes.client.dsl.Watcher;
+import io.fabric8.kubernetes.client.KubernetesClientException;
+import io.fabric8.kubernetes.client.Watcher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/internal/DefaultResourceList.java b/src/main/java/io/fabric8/kubernetes/client/internal/DefaultResourceList.java
similarity index 86%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/internal/DefaultResourceList.java
rename to src/main/java/io/fabric8/kubernetes/client/internal/DefaultResourceList.java
index 09f0b4652c3..777b6603803 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/internal/DefaultResourceList.java
+++ b/src/main/java/io/fabric8/kubernetes/client/internal/DefaultResourceList.java
@@ -1,10 +1,10 @@
-package io.fabric8.kubernetes.client.dsl.internal;
+package io.fabric8.kubernetes.client.internal;
 
 import com.ning.http.client.AsyncHttpClient;
 import io.fabric8.kubernetes.api.model.Doneable;
-import io.fabric8.kubernetes.client.dsl.ResourceList;
+import io.fabric8.kubernetes.client.FilteredResourceList;
+import io.fabric8.kubernetes.client.ResourceList;
 import io.fabric8.kubernetes.api.builder.Builder;
-import io.fabric8.kubernetes.client.dsl.FilteredResourceList;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 
@@ -14,7 +14,7 @@
 public class DefaultResourceList<T extends HasMetadata, L extends KubernetesResourceList, B extends Builder<T>, D extends Doneable<T>>
   extends BaseResourceList<T, L, B, D>
   implements ResourceList<T, L, B>,
-             FilteredResourceList<T, L> {
+  FilteredResourceList<T, L> {
 
   public DefaultResourceList(AsyncHttpClient httpClient, URL rootUrl, String resourceT, Class<T> clazz, Class<L> listClazz, Class<B> builderClazz, Class<D> updateableClazz) {
     super(httpClient, rootUrl, resourceT, clazz, listClazz, builderClazz, updateableClazz);
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/internal/KubeConfigUtils.java b/src/main/java/io/fabric8/kubernetes/client/internal/KubeConfigUtils.java
similarity index 98%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/internal/KubeConfigUtils.java
rename to src/main/java/io/fabric8/kubernetes/client/internal/KubeConfigUtils.java
index b345dc817ba..479564c550e 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/internal/KubeConfigUtils.java
+++ b/src/main/java/io/fabric8/kubernetes/client/internal/KubeConfigUtils.java
@@ -1,4 +1,4 @@
-package io.fabric8.kubernetes.client.dsl.internal;
+package io.fabric8.kubernetes.client.internal;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/internal/NamedResource.java b/src/main/java/io/fabric8/kubernetes/client/internal/NamedResource.java
similarity index 90%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/internal/NamedResource.java
rename to src/main/java/io/fabric8/kubernetes/client/internal/NamedResource.java
index 174f8f80d54..356e639e9e7 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/internal/NamedResource.java
+++ b/src/main/java/io/fabric8/kubernetes/client/internal/NamedResource.java
@@ -1,13 +1,13 @@
-package io.fabric8.kubernetes.client.dsl.internal;
+package io.fabric8.kubernetes.client.internal;
 
 import io.fabric8.kubernetes.api.builder.Builder;
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.kubernetes.api.model.Doneable;
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.fabric8.kubernetes.client.dsl.BuilderUpdate;
-import io.fabric8.kubernetes.client.dsl.KubernetesClientException;
-import io.fabric8.kubernetes.client.dsl.NamedNamespacedResource;
-import io.fabric8.kubernetes.client.dsl.Update;
+import io.fabric8.kubernetes.client.BuilderUpdate;
+import io.fabric8.kubernetes.client.KubernetesClientException;
+import io.fabric8.kubernetes.client.NamedNamespacedResource;
+import io.fabric8.kubernetes.client.Update;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -17,7 +17,7 @@
 
 public class NamedResource<T extends HasMetadata, B extends Builder<T>, D extends Doneable<T>>
   extends BaseResource<T, B, D>
-  implements io.fabric8.kubernetes.client.dsl.NamedResource<T, B, D>,
+  implements io.fabric8.kubernetes.client.NamedResource<T, B, D>,
   NamedNamespacedResource<T, B, D> {
 
   private URL resourceUrl;
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/internal/NamespaceAwareResourceList.java b/src/main/java/io/fabric8/kubernetes/client/internal/NamespaceAwareResourceList.java
similarity index 73%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/internal/NamespaceAwareResourceList.java
rename to src/main/java/io/fabric8/kubernetes/client/internal/NamespaceAwareResourceList.java
index 9462ac9cad3..202eb9a5aac 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/internal/NamespaceAwareResourceList.java
+++ b/src/main/java/io/fabric8/kubernetes/client/internal/NamespaceAwareResourceList.java
@@ -1,17 +1,17 @@
-package io.fabric8.kubernetes.client.dsl.internal;
+package io.fabric8.kubernetes.client.internal;
 
 import com.ning.http.client.AsyncHttpClient;
 import io.fabric8.kubernetes.api.builder.Builder;
 import io.fabric8.kubernetes.api.model.Doneable;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
-import io.fabric8.kubernetes.client.dsl.NamespacedResourceList;
+import io.fabric8.kubernetes.client.NamespacedResourceList;
 
 import java.net.URL;
 
 public class NamespaceAwareResourceList<T extends HasMetadata, L extends KubernetesResourceList, B extends Builder<T>, D extends Doneable<T>>
   extends DefaultResourceList<T, L, B, D>
-  implements io.fabric8.kubernetes.client.dsl.NamespaceAwareResourceList<T, L, B, D> {
+  implements io.fabric8.kubernetes.client.NamespaceAwareResourceList<T, L, B, D> {
 
   public NamespaceAwareResourceList(AsyncHttpClient httpClient, URL rootUrl, String resourceT, Class<T> clazz, Class<L> listClazz, Class<B> builderClazz, Class<D> updateableClazz) {
     super(httpClient, rootUrl, resourceT, clazz, listClazz, builderClazz, updateableClazz);
@@ -19,7 +19,7 @@ public NamespaceAwareResourceList(AsyncHttpClient httpClient, URL rootUrl, Strin
 
   @Override
   public NamespacedResourceList<T, L, B, D> inNamespace(String namespace) {
-    return new io.fabric8.kubernetes.client.dsl.internal.NamespacedResourceList<>(namespace, this);
+    return new io.fabric8.kubernetes.client.internal.NamespacedResourceList<>(namespace, this);
   }
 
 }
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/internal/NamespacedResourceList.java b/src/main/java/io/fabric8/kubernetes/client/internal/NamespacedResourceList.java
similarity index 89%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/internal/NamespacedResourceList.java
rename to src/main/java/io/fabric8/kubernetes/client/internal/NamespacedResourceList.java
index e5e24a13d9d..125e2033c6b 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/internal/NamespacedResourceList.java
+++ b/src/main/java/io/fabric8/kubernetes/client/internal/NamespacedResourceList.java
@@ -1,13 +1,13 @@
-package io.fabric8.kubernetes.client.dsl.internal;
+package io.fabric8.kubernetes.client.internal;
 
 import io.fabric8.kubernetes.api.builder.Builder;
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.kubernetes.api.model.Doneable;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
-import io.fabric8.kubernetes.client.dsl.FilteredNamespacedResourceList;
-import io.fabric8.kubernetes.client.dsl.KubernetesClientException;
-import io.fabric8.kubernetes.client.dsl.NamedNamespacedResource;
+import io.fabric8.kubernetes.client.FilteredNamespacedResourceList;
+import io.fabric8.kubernetes.client.KubernetesClientException;
+import io.fabric8.kubernetes.client.NamedNamespacedResource;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -17,7 +17,7 @@
 
 public class NamespacedResourceList<T extends HasMetadata, L extends KubernetesResourceList, B extends Builder<T>, D extends Doneable<T>>
   extends BaseResourceList<T, L, B, D>
-  implements io.fabric8.kubernetes.client.dsl.NamespacedResourceList<T, L, B, D>,
+  implements io.fabric8.kubernetes.client.NamespacedResourceList<T, L, B, D>,
   FilteredNamespacedResourceList<T, L> {
 
   NamespacedResourceList(String namespace, DefaultResourceList resourceList) {
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/internal/NonNamespacedResourceList.java b/src/main/java/io/fabric8/kubernetes/client/internal/NonNamespacedResourceList.java
similarity index 85%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/internal/NonNamespacedResourceList.java
rename to src/main/java/io/fabric8/kubernetes/client/internal/NonNamespacedResourceList.java
index d3d6a082abb..105e42cb7c0 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/internal/NonNamespacedResourceList.java
+++ b/src/main/java/io/fabric8/kubernetes/client/internal/NonNamespacedResourceList.java
@@ -1,4 +1,4 @@
-package io.fabric8.kubernetes.client.dsl.internal;
+package io.fabric8.kubernetes.client.internal;
 
 import com.ning.http.client.AsyncHttpClient;
 import io.fabric8.kubernetes.api.builder.Builder;
@@ -6,8 +6,8 @@
 import io.fabric8.kubernetes.api.model.Doneable;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
-import io.fabric8.kubernetes.client.dsl.KubernetesClientException;
-import io.fabric8.kubernetes.client.dsl.NamedResource;
+import io.fabric8.kubernetes.client.KubernetesClientException;
+import io.fabric8.kubernetes.client.NamedResource;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -17,7 +17,7 @@
 
 public class NonNamespacedResourceList<T extends HasMetadata, L extends KubernetesResourceList, B extends Builder<T>, D extends Doneable<T>>
   extends DefaultResourceList<T, L, B, D>
-  implements io.fabric8.kubernetes.client.dsl.NonNamespacedResourceList<T, L, B, D> {
+  implements io.fabric8.kubernetes.client.NonNamespacedResourceList<T, L, B, D> {
 
   public NonNamespacedResourceList(AsyncHttpClient httpClient, URL rootUrl, String resourceT, Class<T> clazz, Class<L> listClazz, Class<B> builderClazz, Class<D> updateableClazz) {
     super(httpClient, rootUrl, resourceT, clazz, listClazz, builderClazz, updateableClazz);
@@ -26,7 +26,7 @@ public NonNamespacedResourceList(AsyncHttpClient httpClient, URL rootUrl, String
   @Override
   public NamedResource<T, B, D> withName(String name) throws KubernetesClientException {
     try {
-      return new io.fabric8.kubernetes.client.dsl.internal.NamedResource<>(name, this);
+      return new io.fabric8.kubernetes.client.internal.NamedResource<T, B, D>(name, this);
     } catch (MalformedURLException e) {
       throw new KubernetesClientException("Malformed resource URL", e);
     }
diff --git a/src/main/java/io/fabric8/kubernetes/client/dsl/internal/Utils.java b/src/main/java/io/fabric8/kubernetes/client/internal/Utils.java
similarity index 98%
rename from src/main/java/io/fabric8/kubernetes/client/dsl/internal/Utils.java
rename to src/main/java/io/fabric8/kubernetes/client/internal/Utils.java
index 39ab628c5bb..f1ab3b3bf1f 100644
--- a/src/main/java/io/fabric8/kubernetes/client/dsl/internal/Utils.java
+++ b/src/main/java/io/fabric8/kubernetes/client/internal/Utils.java
@@ -1,4 +1,4 @@
-package io.fabric8.kubernetes.client.dsl.internal;
+package io.fabric8.kubernetes.client.internal;
 
 import com.ning.http.util.Base64;
 import net.oauth.signature.pem.PEMReader;
diff --git a/src/test/java/io/fabric8/kubernetes/client/dsl/examples/DeleteExamples.java b/src/test/java/io/fabric8/kubernetes/client/examples/DeleteExamples.java
similarity index 73%
rename from src/test/java/io/fabric8/kubernetes/client/dsl/examples/DeleteExamples.java
rename to src/test/java/io/fabric8/kubernetes/client/examples/DeleteExamples.java
index 154ab7a0d17..a601b6b0804 100644
--- a/src/test/java/io/fabric8/kubernetes/client/dsl/examples/DeleteExamples.java
+++ b/src/test/java/io/fabric8/kubernetes/client/examples/DeleteExamples.java
@@ -1,8 +1,8 @@
-package io.fabric8.kubernetes.client.dsl.examples;
+package io.fabric8.kubernetes.client.examples;
 
-import io.fabric8.kubernetes.client.dsl.DefaultKubernetesClient;
-import io.fabric8.kubernetes.client.dsl.KubernetesClient;
-import io.fabric8.kubernetes.client.dsl.KubernetesClientException;
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/test/java/io/fabric8/kubernetes/client/dsl/examples/FullExample.java b/src/test/java/io/fabric8/kubernetes/client/examples/FullExample.java
similarity index 97%
rename from src/test/java/io/fabric8/kubernetes/client/dsl/examples/FullExample.java
rename to src/test/java/io/fabric8/kubernetes/client/examples/FullExample.java
index 21c3e212959..4c87ed829da 100644
--- a/src/test/java/io/fabric8/kubernetes/client/dsl/examples/FullExample.java
+++ b/src/test/java/io/fabric8/kubernetes/client/examples/FullExample.java
@@ -1,9 +1,8 @@
-package io.fabric8.kubernetes.client.dsl.examples;
+package io.fabric8.kubernetes.client.examples;
 
 import com.ning.http.client.ws.WebSocket;
-import io.fabric8.kubernetes.api.model.Quantity;
-import io.fabric8.kubernetes.client.dsl.*;
 import io.fabric8.kubernetes.api.model.*;
+import io.fabric8.kubernetes.client.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/test/java/io/fabric8/kubernetes/client/dsl/examples/ListExamples.java b/src/test/java/io/fabric8/kubernetes/client/examples/ListExamples.java
similarity index 81%
rename from src/test/java/io/fabric8/kubernetes/client/dsl/examples/ListExamples.java
rename to src/test/java/io/fabric8/kubernetes/client/examples/ListExamples.java
index 90aa8b12850..8b79261d6ce 100644
--- a/src/test/java/io/fabric8/kubernetes/client/dsl/examples/ListExamples.java
+++ b/src/test/java/io/fabric8/kubernetes/client/examples/ListExamples.java
@@ -1,8 +1,8 @@
-package io.fabric8.kubernetes.client.dsl.examples;
+package io.fabric8.kubernetes.client.examples;
 
-import io.fabric8.kubernetes.client.dsl.DefaultKubernetesClient;
-import io.fabric8.kubernetes.client.dsl.KubernetesClient;
-import io.fabric8.kubernetes.client.dsl.KubernetesClientException;
+import io.fabric8.kubernetes.client.KubernetesClientException;
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/test/java/io/fabric8/kubernetes/client/dsl/internal/UtilsTest.java b/src/test/java/io/fabric8/kubernetes/client/internal/UtilsTest.java
similarity index 95%
rename from src/test/java/io/fabric8/kubernetes/client/dsl/internal/UtilsTest.java
rename to src/test/java/io/fabric8/kubernetes/client/internal/UtilsTest.java
index a48e0a8ac3a..3a0eed30529 100644
--- a/src/test/java/io/fabric8/kubernetes/client/dsl/internal/UtilsTest.java
+++ b/src/test/java/io/fabric8/kubernetes/client/internal/UtilsTest.java
@@ -1,4 +1,4 @@
-package io.fabric8.kubernetes.client.dsl.internal;
+package io.fabric8.kubernetes.client.internal;
 
 import org.junit.Test;