diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00aaf702c18..693933fdb18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
 * Fix #3057: Removed debug calls for CustomResource during deserialization
 * Fix #3050: More enforcement of the informer lifecycle
 * Fix #3061: Removed the deltafifo from the informer logic
+* Use apiGroupName in generated package for OpenShiftClient Handler/OperationsImpl classes
 
 #### Dependency Upgrade
 * Fix #2979: Update Kubernetes Model to v1.21.0
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/DefaultOpenShiftClient.java b/openshift-client/src/main/java/io/fabric8/openshift/client/DefaultOpenShiftClient.java
index 1a12f91fba7..efca254df31 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/DefaultOpenShiftClient.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/DefaultOpenShiftClient.java
@@ -184,31 +184,31 @@
 import io.fabric8.openshift.client.dsl.ProjectOperation;
 import io.fabric8.openshift.client.dsl.ProjectRequestOperation;
 import io.fabric8.openshift.client.dsl.TemplateResource;
-import io.fabric8.openshift.client.dsl.internal.BuildConfigOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.BuildOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ClusterNetworkOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ClusterRoleBindingOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.DeploymentConfigOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.EgressNetworkPolicyOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.GroupOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ImageOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ImageStreamOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ImageStreamTagOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ImageTagOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.NetNamespaceOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.OAuthAccessTokenOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.OAuthAuthorizeTokenOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.OAuthClientOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.build.BuildConfigOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.build.BuildOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.network.ClusterNetworkOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.authorization.ClusterRoleBindingOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.apps.DeploymentConfigOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.network.EgressNetworkPolicyOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.user.GroupOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.image.ImageOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.image.ImageStreamOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.image.ImageStreamTagOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.image.ImageTagOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.network.NetNamespaceOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.oauth.OAuthAccessTokenOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.oauth.OAuthAuthorizeTokenOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.oauth.OAuthClientOperationsImpl;
 import io.fabric8.openshift.client.dsl.internal.OpenShiftSubjectAccessReviewOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ProjectOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.project.ProjectOperationsImpl;
 import io.fabric8.openshift.client.dsl.internal.ProjectRequestsOperationImpl;
-import io.fabric8.openshift.client.dsl.internal.RangeAllocationOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.RoleBindingOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.RoleOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.RouteOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.SecurityContextConstraintsOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.TemplateOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.UserOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.security.RangeAllocationOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.authorization.RoleBindingOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.authorization.RoleOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.route.RouteOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.security.SecurityContextConstraintsOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.core.TemplateOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.user.UserOperationsImpl;
 import io.fabric8.openshift.client.internal.OpenShiftClusterOperationsImpl;
 import io.fabric8.openshift.client.internal.OpenShiftNamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl;
 import io.fabric8.openshift.client.internal.OpenShiftOAuthInterceptor;
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftConfigAPIGroupClient.java b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftConfigAPIGroupClient.java
index 882dcb8ae75..6705d7592a7 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftConfigAPIGroupClient.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftConfigAPIGroupClient.java
@@ -40,16 +40,16 @@
 import io.fabric8.openshift.api.model.Scheduler;
 import io.fabric8.openshift.api.model.SchedulerList;
 import io.fabric8.openshift.client.dsl.OpenShiftConfigAPIGroupDSL;
-import io.fabric8.openshift.client.dsl.internal.APIServerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ClusterOperatorOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ClusterVersionOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.FeatureGateOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.InfrastructureOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.OAuthOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.OperatorHubOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ProxyOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.IngressOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.SchedulerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.config.APIServerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.config.ClusterOperatorOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.config.ClusterVersionOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.config.FeatureGateOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.config.InfrastructureOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.config.OAuthOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.config.OperatorHubOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.config.ProxyOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.config.IngressOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.config.SchedulerOperationsImpl;
 import okhttp3.OkHttpClient;
 
 public class OpenShiftConfigAPIGroupClient extends BaseClient implements OpenShiftConfigAPIGroupDSL {
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftConsoleAPIGroupClient.java b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftConsoleAPIGroupClient.java
index c6759708bd2..92a18ce304b 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftConsoleAPIGroupClient.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftConsoleAPIGroupClient.java
@@ -30,11 +30,11 @@
 import io.fabric8.openshift.api.model.console.v1.ConsoleYAMLSample;
 import io.fabric8.openshift.api.model.console.v1.ConsoleYAMLSampleList;
 import io.fabric8.openshift.client.dsl.OpenShiftConsoleAPIGroupDSL;
-import io.fabric8.openshift.client.dsl.internal.ConsoleCLIDownloadOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ConsoleExternalLogLinkOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ConsoleLinkOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ConsoleNotificationOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ConsoleYAMLSampleOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.console.ConsoleCLIDownloadOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.console.ConsoleExternalLogLinkOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.console.ConsoleLinkOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.console.ConsoleNotificationOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.console.ConsoleYAMLSampleOperationsImpl;
 import okhttp3.OkHttpClient;
 
 public class OpenShiftConsoleAPIGroupClient extends BaseClient implements OpenShiftConsoleAPIGroupDSL {
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftMonitoringAPIGroupClient.java b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftMonitoringAPIGroupClient.java
index 0bec48264ef..f54f35127c0 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftMonitoringAPIGroupClient.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftMonitoringAPIGroupClient.java
@@ -30,11 +30,11 @@
 import io.fabric8.openshift.api.model.monitoring.v1.ServiceMonitor;
 import io.fabric8.openshift.api.model.monitoring.v1.ServiceMonitorList;
 import io.fabric8.openshift.client.dsl.OpenShiftMonitoringAPIGroupDSL;
-import io.fabric8.openshift.client.dsl.internal.AlertmanagerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.PodMonitorOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.PrometheusOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.PrometheusRuleOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ServiceMonitorOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.monitoring.coreos.AlertmanagerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.monitoring.coreos.PodMonitorOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.monitoring.coreos.PrometheusOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.monitoring.coreos.PrometheusRuleOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.monitoring.coreos.ServiceMonitorOperationsImpl;
 import okhttp3.OkHttpClient;
 
 public class OpenShiftMonitoringAPIGroupClient extends BaseClient implements OpenShiftMonitoringAPIGroupDSL {
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftOperatorAPIGroupClient.java b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftOperatorAPIGroupClient.java
index 03d2d5b27b9..65635e1e8e5 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftOperatorAPIGroupClient.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftOperatorAPIGroupClient.java
@@ -59,25 +59,25 @@
 import io.fabric8.openshift.api.model.operator.v1alpha1.ImageContentSourcePolicy;
 import io.fabric8.openshift.api.model.operator.v1alpha1.ImageContentSourcePolicyList;
 import io.fabric8.openshift.client.dsl.OpenShiftOperatorAPIGroupDSL;
-import io.fabric8.openshift.client.dsl.internal.AuthenticationOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.CSISnapshotControllerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ConsoleOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.DNSOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.DNSRecordOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.EtcdOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ImageContentSourcePolicyOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ImagePrunerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.IngressControllerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.KubeAPIServerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.KubeControllerManagerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.KubeSchedulerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.KubeStorageVersionMigratorOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.NetworkOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.OpenShiftAPIServerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.OpenShiftControllerManagerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ServiceCAOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ServiceCatalogAPIServerOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ServiceCatalogControllerManagerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.AuthenticationOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.CSISnapshotControllerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.ConsoleOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.DNSOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.ingress.operator.DNSRecordOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.EtcdOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.ImageContentSourcePolicyOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.imageregistry.operator.ImagePrunerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.IngressControllerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.KubeAPIServerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.KubeControllerManagerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.KubeSchedulerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.KubeStorageVersionMigratorOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.NetworkOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.OpenShiftAPIServerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.OpenShiftControllerManagerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.ServiceCAOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.ServiceCatalogAPIServerOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operator.ServiceCatalogControllerManagerOperationsImpl;
 import okhttp3.OkHttpClient;
 
 public class OpenShiftOperatorAPIGroupClient extends BaseClient implements OpenShiftOperatorAPIGroupDSL {
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftOperatorHubAPIGroupClient.java b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftOperatorHubAPIGroupClient.java
index 360027e6321..a89e52aee3b 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftOperatorHubAPIGroupClient.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftOperatorHubAPIGroupClient.java
@@ -30,11 +30,11 @@
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.Subscription;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.SubscriptionList;
 import io.fabric8.openshift.client.dsl.OpenShiftOperatorHubAPIGroupDSL;
-import io.fabric8.openshift.client.dsl.internal.CatalogSourceOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ClusterServiceVersionOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.InstallPlanOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.OperatorGroupOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.SubscriptionOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operators.coreos.CatalogSourceOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operators.coreos.ClusterServiceVersionOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operators.coreos.InstallPlanOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operators.coreos.OperatorGroupOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.operators.coreos.SubscriptionOperationsImpl;
 import okhttp3.OkHttpClient;
 
 public class OpenShiftOperatorHubAPIGroupClient extends BaseClient implements OpenShiftOperatorHubAPIGroupDSL {
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftQuotaAPIGroupClient.java b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftQuotaAPIGroupClient.java
index 2932c237ee6..dea5a14af0d 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftQuotaAPIGroupClient.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftQuotaAPIGroupClient.java
@@ -24,8 +24,8 @@
 import io.fabric8.openshift.api.model.ClusterResourceQuota;
 import io.fabric8.openshift.api.model.ClusterResourceQuotaList;
 import io.fabric8.openshift.client.dsl.OpenShiftQuotaAPIGroupDSL;
-import io.fabric8.openshift.client.dsl.internal.AppliedClusterResourceQuotaOperationsImpl;
-import io.fabric8.openshift.client.dsl.internal.ClusterResourceQuotaOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.quota.AppliedClusterResourceQuotaOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.quota.ClusterResourceQuotaOperationsImpl;
 import okhttp3.OkHttpClient;
 
 public class OpenShiftQuotaAPIGroupClient extends BaseClient implements OpenShiftQuotaAPIGroupDSL {
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/DeploymentConfigOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/apps/DeploymentConfigOperationsImpl.java
similarity index 98%
rename from openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/DeploymentConfigOperationsImpl.java
rename to openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/apps/DeploymentConfigOperationsImpl.java
index 3ccb3dbfe7a..2661905dfe8 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/DeploymentConfigOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/apps/DeploymentConfigOperationsImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.apps;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.kubernetes.api.model.Pod;
@@ -27,6 +27,7 @@
 import io.fabric8.kubernetes.client.utils.PodOperationUtil;
 import io.fabric8.kubernetes.client.dsl.internal.RollingOperationContext;
 import io.fabric8.kubernetes.client.utils.URLUtils;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
 import okhttp3.HttpUrl;
 import okhttp3.Request;
 import okhttp3.Response;
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/ClusterRoleBindingOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/authorization/ClusterRoleBindingOperationsImpl.java
similarity index 93%
rename from openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/ClusterRoleBindingOperationsImpl.java
rename to openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/authorization/ClusterRoleBindingOperationsImpl.java
index e1280efebaf..261973ba039 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/ClusterRoleBindingOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/authorization/ClusterRoleBindingOperationsImpl.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.authorization;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
 import okhttp3.OkHttpClient;
 import io.fabric8.openshift.api.model.ClusterRoleBinding;
 import io.fabric8.openshift.api.model.ClusterRoleBindingBuilder;
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/RoleBindingOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/authorization/RoleBindingOperationsImpl.java
similarity index 97%
rename from openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/RoleBindingOperationsImpl.java
rename to openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/authorization/RoleBindingOperationsImpl.java
index 9f0f4109162..6051b22cf7b 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/RoleBindingOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/authorization/RoleBindingOperationsImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.authorization;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.kubernetes.api.builder.TypedVisitor;
@@ -25,6 +25,7 @@
 import io.fabric8.openshift.api.model.RoleBindingBuilder;
 import io.fabric8.openshift.api.model.RoleBindingList;
 import io.fabric8.openshift.client.OpenShiftConfig;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
 import okhttp3.OkHttpClient;
 
 import java.io.IOException;
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/RoleOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/authorization/RoleOperationsImpl.java
similarity index 93%
rename from openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/RoleOperationsImpl.java
rename to openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/authorization/RoleOperationsImpl.java
index 51dd8045906..c5265fc0f62 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/RoleOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/authorization/RoleOperationsImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.authorization;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.kubernetes.client.dsl.Resource;
@@ -22,6 +22,7 @@
 import io.fabric8.openshift.api.model.RoleBuilder;
 import io.fabric8.openshift.api.model.RoleList;
 import io.fabric8.openshift.client.OpenShiftConfig;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
 import okhttp3.OkHttpClient;
 
 import static io.fabric8.openshift.client.OpenShiftAPIGroups.AUTHORIZATION;
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/BuildConfigOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/build/BuildConfigOperationsImpl.java
similarity index 98%
rename from openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/BuildConfigOperationsImpl.java
rename to openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/build/BuildConfigOperationsImpl.java
index 900938ea545..bccc4a1260b 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/BuildConfigOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/build/BuildConfigOperationsImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.build;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.kubernetes.api.model.Event;
@@ -45,6 +45,8 @@
 import io.fabric8.openshift.client.dsl.buildconfig.CommitterAuthorMessageAsFileTimeoutInputStreamable;
 import io.fabric8.openshift.client.dsl.buildconfig.CommitterEmailable;
 import io.fabric8.openshift.client.dsl.buildconfig.MessageAsFileTimeoutInputStreamable;
+import io.fabric8.openshift.client.dsl.internal.BuildConfigOperationContext;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/BuildOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/build/BuildOperationsImpl.java
similarity index 98%
rename from openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/BuildOperationsImpl.java
rename to openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/build/BuildOperationsImpl.java
index adc504e05f2..a65039a00a3 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/BuildOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/build/BuildOperationsImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.build;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.kubernetes.api.model.Pod;
@@ -31,6 +31,8 @@
 import io.fabric8.kubernetes.client.internal.PatchUtils;
 import io.fabric8.kubernetes.client.utils.URLUtils;
 import io.fabric8.openshift.client.dsl.BuildResource;
+import io.fabric8.openshift.client.dsl.internal.BuildOperationContext;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
 import io.fabric8.openshift.client.internal.patchmixins.BuildMixIn;
 import okhttp3.OkHttpClient;
 import io.fabric8.openshift.api.model.Build;
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/TemplateOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/core/TemplateOperationsImpl.java
similarity index 98%
rename from openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/TemplateOperationsImpl.java
rename to openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/core/TemplateOperationsImpl.java
index 24ad39b8c94..df0441ce3cb 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/TemplateOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/core/TemplateOperationsImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.core;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -36,6 +36,8 @@
 import io.fabric8.openshift.client.ParameterValue;
 import io.fabric8.openshift.client.dsl.TemplateOperation;
 import io.fabric8.openshift.client.dsl.TemplateResource;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
+import io.fabric8.openshift.client.dsl.internal.TemplateOperationContext;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthAccessTokenOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/oauth/OAuthAccessTokenOperationsImpl.java
similarity index 93%
rename from openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthAccessTokenOperationsImpl.java
rename to openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/oauth/OAuthAccessTokenOperationsImpl.java
index 863d5fc3931..2e6743be6bf 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthAccessTokenOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/oauth/OAuthAccessTokenOperationsImpl.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.oauth;
 
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
 import okhttp3.OkHttpClient;
 import io.fabric8.openshift.api.model.OAuthAccessToken;
 import io.fabric8.openshift.api.model.OAuthAccessTokenList;
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthAuthorizeTokenOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/oauth/OAuthAuthorizeTokenOperationsImpl.java
similarity index 94%
rename from openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthAuthorizeTokenOperationsImpl.java
rename to openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/oauth/OAuthAuthorizeTokenOperationsImpl.java
index 8e15a4a8cfe..c3b3fc6ec67 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthAuthorizeTokenOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/oauth/OAuthAuthorizeTokenOperationsImpl.java
@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.oauth;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.openshift.api.model.OAuthAuthorizeToken;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
 import okhttp3.OkHttpClient;
 import io.fabric8.openshift.api.model.OAuthAuthorizeTokenBuilder;
 import io.fabric8.openshift.api.model.OAuthAuthorizeTokenList;
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthClientOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/oauth/OAuthClientOperationsImpl.java
similarity index 94%
rename from openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthClientOperationsImpl.java
rename to openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/oauth/OAuthClientOperationsImpl.java
index 8ee50f10da7..16dc781889b 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthClientOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/oauth/OAuthClientOperationsImpl.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.oauth;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
 import okhttp3.OkHttpClient;
 import io.fabric8.openshift.api.model.OAuthClient;
 import io.fabric8.openshift.api.model.OAuthClientBuilder;
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/ProjectOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/project/ProjectOperationsImpl.java
similarity index 98%
rename from openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/ProjectOperationsImpl.java
rename to openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/project/ProjectOperationsImpl.java
index 3bc5194626a..c2e53fa30b7 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/ProjectOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/project/ProjectOperationsImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.project;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.kubernetes.api.model.DeletionPropagation;
@@ -25,6 +25,7 @@
 import io.fabric8.kubernetes.client.dsl.internal.NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl;
 import io.fabric8.openshift.api.model.ProjectBuilder;
 import io.fabric8.openshift.client.dsl.ProjectOperation;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
 import okhttp3.OkHttpClient;
 import io.fabric8.openshift.api.model.Project;
 import io.fabric8.openshift.api.model.ProjectList;
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/SecurityContextConstraintsOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/security/SecurityContextConstraintsOperationsImpl.java
similarity index 94%
rename from openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/SecurityContextConstraintsOperationsImpl.java
rename to openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/security/SecurityContextConstraintsOperationsImpl.java
index c1f0c6bf590..18e51298acf 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/SecurityContextConstraintsOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/security/SecurityContextConstraintsOperationsImpl.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.security;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
@@ -22,6 +22,7 @@
 import io.fabric8.openshift.api.model.SecurityContextConstraintsList;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.openshift.client.OpenShiftConfig;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
 import okhttp3.OkHttpClient;
 
 import static io.fabric8.openshift.client.OpenShiftAPIGroups.SECURITY;
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/GroupOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/user/GroupOperationsImpl.java
similarity index 93%
rename from openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/GroupOperationsImpl.java
rename to openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/user/GroupOperationsImpl.java
index 0d10bee01f8..6ec96b2d957 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/GroupOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/user/GroupOperationsImpl.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.user;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
 import okhttp3.OkHttpClient;
 import io.fabric8.openshift.api.model.Group;
 import io.fabric8.openshift.api.model.GroupBuilder;
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/UserOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/user/UserOperationsImpl.java
similarity index 93%
rename from openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/UserOperationsImpl.java
rename to openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/user/UserOperationsImpl.java
index a42befafc7c..e61a6530179 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/UserOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/user/UserOperationsImpl.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.user;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
 import okhttp3.OkHttpClient;
 import io.fabric8.openshift.api.model.User;
 import io.fabric8.openshift.api.model.UserBuilder;
diff --git a/openshift-client/src/main/resources/resource-handler-services.vm b/openshift-client/src/main/resources/resource-handler-services.vm
index 96122a4ff18..ed87f69eb0c 100644
--- a/openshift-client/src/main/resources/resource-handler-services.vm
+++ b/openshift-client/src/main/resources/resource-handler-services.vm
@@ -14,6 +14,20 @@
  * limitations under the License.
  *#
 #foreach ($m in ${model.values()})
-io.fabric8.openshift.client.handlers.${m.name}Handler
+  #foreach ($annotation in $m.annotations)
+    #set ($annotationName = $annotation.getClassRef().getName())
+    #if ($annotationName.endsWith("Group"))
+      #set ($apiGroup = $annotation.getParameters().get("value"))
+    #end
+    #if ($apiGroup.contains(".openshift.io"))
+      #set ($packageSuffix = $apiGroup.substring(0, $apiGroup.indexOf(".openshift.io")))
+    #elseif ($apiGroup.contains(".coreos.com"))
+      #set ($packageSuffix = $apiGroup.substring(0, $apiGroup.indexOf(".com")))
+    #else
+      #set ($packageSuffix = "core")
+    #end
+  #end
+
+io.fabric8.openshift.client.handlers.${packageSuffix}.${m.name}Handler
 #end
 io.fabric8.openshift.client.handlers.ProjectRequestHandler
diff --git a/openshift-client/src/main/resources/resource-handler.vm b/openshift-client/src/main/resources/resource-handler.vm
index ebb857892f7..3f214e14aa0 100644
--- a/openshift-client/src/main/resources/resource-handler.vm
+++ b/openshift-client/src/main/resources/resource-handler.vm
@@ -23,10 +23,17 @@
   #if ($annotationName.endsWith("Group"))
     #set ($apiGroup = $annotation.getParameters().get("value"))
   #end
+  #if ($apiGroup.contains(".openshift.io"))
+    #set ($packageSuffix = $apiGroup.substring(0, $apiGroup.indexOf(".openshift.io")))
+  #elseif ($apiGroup.contains(".coreos.com"))
+    #set ($packageSuffix = $apiGroup.substring(0, $apiGroup.indexOf(".com")))
+  #else
+    #set ($packageSuffix = "core")
+  #end
 #end
 
 
-package io.fabric8.openshift.client.handlers;
+package io.fabric8.openshift.client.handlers.$packageSuffix;
 
 import java.util.function.Predicate;
 
@@ -35,7 +42,7 @@ import io.fabric8.openshift.client.OpenShiftConfig;
 import io.fabric8.kubernetes.client.ResourceHandler;
 import io.fabric8.kubernetes.client.Watch;
 import io.fabric8.kubernetes.client.Watcher;
-import io.fabric8.openshift.client.dsl.internal.${model.name}OperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.$packageSuffix.${model.name}OperationsImpl;
 import io.fabric8.kubernetes.client.utils.ApiVersionUtil;
 
 import io.fabric8.openshift.client.OpenShiftConfig;
diff --git a/openshift-client/src/main/resources/resource-operation.vm b/openshift-client/src/main/resources/resource-operation.vm
index 59ec7213f9c..49bf6a6d900 100644
--- a/openshift-client/src/main/resources/resource-operation.vm
+++ b/openshift-client/src/main/resources/resource-operation.vm
@@ -24,6 +24,13 @@
   #if ($annotationName.endsWith("Group"))
     #set ($apiGroupName = $annotation.getParameters().get("value"))
   #end
+  #if ($apiGroupName.contains(".openshift.io"))
+    #set ($packageSuffix = $apiGroupName.substring(0, $apiGroupName.indexOf(".openshift.io")))
+  #elseif ($apiGroupName.contains(".coreos.com"))
+    #set ($packageSuffix = $apiGroupName.substring(0, $apiGroupName.indexOf(".com")))
+  #else
+    #set ($packageSuffix = "core")
+  #end
 #end
 
 #set ($isResourceNamespacedFlag = false)
@@ -34,7 +41,7 @@
 #end
 
 
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.$packageSuffix;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
 import io.fabric8.openshift.client.OpenShiftConfig;
@@ -44,6 +51,7 @@ import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.utils.ApiVersionUtil;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 import io.fabric8.openshift.client.OpenShiftConfig;
+import io.fabric8.openshift.client.dsl.internal.OpenShiftOperation;
 
 import okhttp3.OkHttpClient;
 
diff --git a/openshift-client/src/test/java/io/fabric8/openshift/client/HandlersTest.java b/openshift-client/src/test/java/io/fabric8/openshift/client/HandlersTest.java
index 115056417c2..9d7d9fe11d6 100644
--- a/openshift-client/src/test/java/io/fabric8/openshift/client/HandlersTest.java
+++ b/openshift-client/src/test/java/io/fabric8/openshift/client/HandlersTest.java
@@ -34,27 +34,26 @@
 import io.fabric8.openshift.api.model.Route;
 import io.fabric8.openshift.api.model.SecurityContextConstraints;
 import io.fabric8.openshift.api.model.User;
-import io.fabric8.openshift.client.handlers.BuildConfigHandler;
-import io.fabric8.openshift.client.handlers.BuildHandler;
-import io.fabric8.openshift.client.handlers.DeploymentConfigHandler;
-import io.fabric8.openshift.client.handlers.GroupHandler;
-import io.fabric8.openshift.client.handlers.IdentityHandler;
-import io.fabric8.openshift.client.handlers.ImageHandler;
-import io.fabric8.openshift.client.handlers.ImageStreamHandler;
-import io.fabric8.openshift.client.handlers.ImageStreamTagHandler;
-import io.fabric8.openshift.client.handlers.NetNamespaceHandler;
-import io.fabric8.openshift.client.handlers.OAuthAccessTokenHandler;
-import io.fabric8.openshift.client.handlers.OAuthAuthorizeTokenHandler;
-import io.fabric8.openshift.client.handlers.OAuthClientHandler;
-import io.fabric8.openshift.client.handlers.ProjectHandler;
+import io.fabric8.openshift.client.handlers.build.BuildConfigHandler;
+import io.fabric8.openshift.client.handlers.build.BuildHandler;
+import io.fabric8.openshift.client.handlers.apps.DeploymentConfigHandler;
 import io.fabric8.openshift.client.handlers.ProjectRequestHandler;
-import io.fabric8.openshift.client.handlers.RouteHandler;
-import io.fabric8.openshift.client.handlers.SecurityContextConstraintsHandler;
-import io.fabric8.openshift.client.handlers.UserHandler;
+import io.fabric8.openshift.client.handlers.image.ImageHandler;
+import io.fabric8.openshift.client.handlers.image.ImageStreamHandler;
+import io.fabric8.openshift.client.handlers.image.ImageStreamTagHandler;
+import io.fabric8.openshift.client.handlers.network.NetNamespaceHandler;
+import io.fabric8.openshift.client.handlers.oauth.OAuthAccessTokenHandler;
+import io.fabric8.openshift.client.handlers.oauth.OAuthAuthorizeTokenHandler;
+import io.fabric8.openshift.client.handlers.oauth.OAuthClientHandler;
+import io.fabric8.openshift.client.handlers.project.ProjectHandler;
+import io.fabric8.openshift.client.handlers.route.RouteHandler;
+import io.fabric8.openshift.client.handlers.security.SecurityContextConstraintsHandler;
+import io.fabric8.openshift.client.handlers.user.GroupHandler;
+import io.fabric8.openshift.client.handlers.user.IdentityHandler;
+import io.fabric8.openshift.client.handlers.user.UserHandler;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.Locale;
 
 class HandlersTest {
@@ -81,7 +80,7 @@ void checkHandlers() {
   }
 
   private void checkHandler(HasMetadata hasMetadata, ResourceHandler handler) {
-    assertEquals(hasMetadata.getKind().toLowerCase(Locale.ROOT), handler.getKind().toLowerCase(Locale.ROOT));
-    assertEquals(hasMetadata.getApiVersion().toLowerCase(Locale.ROOT), handler.getApiVersion().toLowerCase(Locale.ROOT));
+    Assertions.assertEquals(hasMetadata.getKind().toLowerCase(Locale.ROOT), handler.getKind().toLowerCase(Locale.ROOT));
+    Assertions.assertEquals(hasMetadata.getApiVersion().toLowerCase(Locale.ROOT), handler.getApiVersion().toLowerCase(Locale.ROOT));
   }
 }
diff --git a/openshift-client/src/test/java/io/fabric8/openshift/client/dsl/internal/OpenShiftControllerPodOperationTest.java b/openshift-client/src/test/java/io/fabric8/openshift/client/dsl/internal/apps/OpenShiftDeploymentConfigPodOperationTest.java
similarity index 68%
rename from openshift-client/src/test/java/io/fabric8/openshift/client/dsl/internal/OpenShiftControllerPodOperationTest.java
rename to openshift-client/src/test/java/io/fabric8/openshift/client/dsl/internal/apps/OpenShiftDeploymentConfigPodOperationTest.java
index 35b805c1e89..f984355a984 100644
--- a/openshift-client/src/test/java/io/fabric8/openshift/client/dsl/internal/OpenShiftControllerPodOperationTest.java
+++ b/openshift-client/src/test/java/io/fabric8/openshift/client/dsl/internal/apps/OpenShiftDeploymentConfigPodOperationTest.java
@@ -13,22 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.apps;
 
 import io.fabric8.openshift.api.model.Build;
 import io.fabric8.openshift.api.model.BuildBuilder;
 import io.fabric8.openshift.api.model.DeploymentConfig;
 import io.fabric8.openshift.api.model.DeploymentConfigBuilder;
+import io.fabric8.openshift.client.dsl.internal.apps.DeploymentConfigOperationsImpl;
+import io.fabric8.openshift.client.dsl.internal.build.BuildOperationsImpl;
 import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
-import static io.fabric8.openshift.client.dsl.internal.BuildOperationsImpl.OPENSHIFT_IO_BUILD_NAME;
-import static io.fabric8.openshift.client.dsl.internal.DeploymentConfigOperationsImpl.OPENSHIFT_IO_DEPLOYMENT_CONFIG_NAME;
+import static io.fabric8.openshift.client.dsl.internal.build.BuildOperationsImpl.OPENSHIFT_IO_BUILD_NAME;
+import static io.fabric8.openshift.client.dsl.internal.apps.DeploymentConfigOperationsImpl.OPENSHIFT_IO_DEPLOYMENT_CONFIG_NAME;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-class OpenShiftControllerPodOperationTest {
+class OpenShiftDeploymentConfigPodOperationTest {
   @Test
   void testDeploymentConfigSelectorLabels() {
     // Given
@@ -44,18 +46,4 @@ void testDeploymentConfigSelectorLabels() {
     assertEquals(deploymentConfig.getMetadata().getName(), labels.get(OPENSHIFT_IO_DEPLOYMENT_CONFIG_NAME));
   }
 
-  @Test
-  void testBuildSelectorLabels() {
-    // Given
-    Build build = new BuildBuilder()
-      .withNewMetadata().withName("dc1").endMetadata()
-      .build();
-
-    // When
-    Map<String, String> labels = BuildOperationsImpl.getBuildPodLabels(build);
-
-    // Then
-    assertNotNull(labels);
-    assertEquals(build.getMetadata().getName(), labels.get(OPENSHIFT_IO_BUILD_NAME));
-  }
 }
diff --git a/openshift-client/src/test/java/io/fabric8/openshift/client/dsl/internal/ArchiveFileInputStreamRequestBodyTest.java b/openshift-client/src/test/java/io/fabric8/openshift/client/dsl/internal/build/ArchiveFileInputStreamRequestBodyTest.java
similarity index 96%
rename from openshift-client/src/test/java/io/fabric8/openshift/client/dsl/internal/ArchiveFileInputStreamRequestBodyTest.java
rename to openshift-client/src/test/java/io/fabric8/openshift/client/dsl/internal/build/ArchiveFileInputStreamRequestBodyTest.java
index 4803d759c8d..76f59a681b1 100644
--- a/openshift-client/src/test/java/io/fabric8/openshift/client/dsl/internal/ArchiveFileInputStreamRequestBodyTest.java
+++ b/openshift-client/src/test/java/io/fabric8/openshift/client/dsl/internal/build/ArchiveFileInputStreamRequestBodyTest.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.openshift.client.dsl.internal;
+package io.fabric8.openshift.client.dsl.internal.build;
 
 import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.openshift.client.OpenShiftConfig;
 import io.fabric8.openshift.client.OpenShiftConfigBuilder;
+import io.fabric8.openshift.client.dsl.internal.build.BuildConfigOperationsImpl;
 import okhttp3.OkHttpClient;
 import okio.BufferedSink;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/openshift-client/src/test/java/io/fabric8/openshift/client/dsl/internal/build/OpenShiftBuildPodOperationTest.java b/openshift-client/src/test/java/io/fabric8/openshift/client/dsl/internal/build/OpenShiftBuildPodOperationTest.java
new file mode 100644
index 00000000000..0bd34563ac4
--- /dev/null
+++ b/openshift-client/src/test/java/io/fabric8/openshift/client/dsl/internal/build/OpenShiftBuildPodOperationTest.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.fabric8.openshift.client.dsl.internal.build;
+
+import io.fabric8.openshift.api.model.Build;
+import io.fabric8.openshift.api.model.BuildBuilder;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static io.fabric8.openshift.client.dsl.internal.build.BuildOperationsImpl.OPENSHIFT_IO_BUILD_NAME;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class OpenShiftBuildPodOperationTest {
+  @Test
+  void testBuildSelectorLabels() {
+    // Given
+    Build build = new BuildBuilder()
+      .withNewMetadata().withName("dc1").endMetadata()
+      .build();
+
+    // When
+    Map<String, String> labels = BuildOperationsImpl.getBuildPodLabels(build);
+
+    // Then
+    assertNotNull(labels);
+    assertEquals(build.getMetadata().getName(), labels.get(OPENSHIFT_IO_BUILD_NAME));
+  }
+}
diff --git a/uberjar/src/test/java/io/fabric8/kubernetes/clnt/UberJarTest.java b/uberjar/src/test/java/io/fabric8/kubernetes/clnt/UberJarTest.java
index fb6b791b009..356a9cde2fd 100644
--- a/uberjar/src/test/java/io/fabric8/kubernetes/clnt/UberJarTest.java
+++ b/uberjar/src/test/java/io/fabric8/kubernetes/clnt/UberJarTest.java
@@ -134,8 +134,8 @@ void testUberJarVersioned() throws Exception {
   private boolean containsOpenShiftKubernetesResources(File resourceHandlerServiceFile, String majorVersion, String minorVersion) throws IOException {
     List<String> lines = Files.readAllLines(resourceHandlerServiceFile.toPath());
     final String deploymentConfigOpenShiftHandler = (majorVersion != null && minorVersion != null) ?
-      "io.fabric8.openshift.clnt.v" + majorVersion + "_" + minorVersion + ".handlers.DeploymentConfigHandler" :
-      "io.fabric8.openshift.client.handlers.DeploymentConfigHandler";
+      "io.fabric8.openshift.clnt.v" + majorVersion + "_" + minorVersion + ".handlers.apps.DeploymentConfigHandler" :
+      "io.fabric8.openshift.client.handlers.apps.DeploymentConfigHandler";
     final String deploymentKubernetesHandler = (majorVersion != null && minorVersion != null) ?
       "io.fabric8.kubernetes.clnt.v" + majorVersion + "_" + minorVersion + ".handlers.apps.v1.DeploymentHandler" :
       "io.fabric8.kubernetes.client.handlers.apps.v1.DeploymentHandler";