diff --git a/charts/kube-components/icons/k8-alb-ingress-controller.png b/charts/kube-components/icons/k8-alb-ingress-controller.png
new file mode 100644
index 0000000..16aa7b4
Binary files /dev/null and b/charts/kube-components/icons/k8-alb-ingress-controller.png differ
diff --git a/charts/kube-components/icons/k8-calico-node.png b/charts/kube-components/icons/k8-calico-node.png
new file mode 100644
index 0000000..16aa7b4
Binary files /dev/null and b/charts/kube-components/icons/k8-calico-node.png differ
diff --git a/charts/kube-components/icons/k8-kiam.png b/charts/kube-components/icons/k8-kiam.png
new file mode 100644
index 0000000..16aa7b4
Binary files /dev/null and b/charts/kube-components/icons/k8-kiam.png differ
diff --git a/charts/kube-components/icons/k8-kube-proxy.png b/charts/kube-components/icons/k8-kube-proxy.png
new file mode 100644
index 0000000..16aa7b4
Binary files /dev/null and b/charts/kube-components/icons/k8-kube-proxy.png differ
diff --git a/charts/kube-components/icons/k8-prometheus-k8s-prometheus.png b/charts/kube-components/icons/k8-prometheus-k8s-prometheus.png
new file mode 100644
index 0000000..16aa7b4
Binary files /dev/null and b/charts/kube-components/icons/k8-prometheus-k8s-prometheus.png differ
diff --git a/charts/kube-components/icons/k8-prometheus-operator.png b/charts/kube-components/icons/k8-prometheus-operator.png
new file mode 100644
index 0000000..16aa7b4
Binary files /dev/null and b/charts/kube-components/icons/k8-prometheus-operator.png differ
diff --git a/charts/kube-components/icons/k8-prometheus-pushgateway.png b/charts/kube-components/icons/k8-prometheus-pushgateway.png
new file mode 100644
index 0000000..16aa7b4
Binary files /dev/null and b/charts/kube-components/icons/k8-prometheus-pushgateway.png differ
diff --git a/charts/kube-components/icons/k8-wavefront-collector.png b/charts/kube-components/icons/k8-wavefront-collector.png
new file mode 100644
index 0000000..16aa7b4
Binary files /dev/null and b/charts/kube-components/icons/k8-wavefront-collector.png differ
diff --git a/charts/kube-components/icons/kube-components.png b/charts/kube-components/icons/kube-components.png
new file mode 100644
index 0000000..3ab6ba6
Binary files /dev/null and b/charts/kube-components/icons/kube-components.png differ
diff --git a/charts/generic/k8-alb-ingress-controller/Readme.md b/charts/kube-components/k8-alb-ingress-controller/Readme.md
similarity index 100%
rename from charts/generic/k8-alb-ingress-controller/Readme.md
rename to charts/kube-components/k8-alb-ingress-controller/Readme.md
diff --git a/charts/generic/k8-alb-ingress-controller/engine.yaml b/charts/kube-components/k8-alb-ingress-controller/engine.yaml
similarity index 100%
rename from charts/generic/k8-alb-ingress-controller/engine.yaml
rename to charts/kube-components/k8-alb-ingress-controller/engine.yaml
diff --git a/charts/generic/k8-alb-ingress-controller/experiment.yaml b/charts/kube-components/k8-alb-ingress-controller/experiment.yaml
similarity index 100%
rename from charts/generic/k8-alb-ingress-controller/experiment.yaml
rename to charts/kube-components/k8-alb-ingress-controller/experiment.yaml
diff --git a/charts/generic/k8-alb-ingress-controller/k8-alb-ingress-controller.chartserviceversion.yaml b/charts/kube-components/k8-alb-ingress-controller/k8-alb-ingress-controller.chartserviceversion.yaml
similarity index 64%
rename from charts/generic/k8-alb-ingress-controller/k8-alb-ingress-controller.chartserviceversion.yaml
rename to charts/kube-components/k8-alb-ingress-controller/k8-alb-ingress-controller.chartserviceversion.yaml
index 635546f..996c65e 100644
--- a/charts/generic/k8-alb-ingress-controller/k8-alb-ingress-controller.chartserviceversion.yaml
+++ b/charts/kube-components/k8-alb-ingress-controller/k8-alb-ingress-controller.chartserviceversion.yaml
@@ -1,20 +1,21 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  name: k8-pod-delete
-  version: 0.0.4
+  name: k8-alb-ingress-controller
+  version: 0.1.0
   annotations:
     categories: Kubernetes
     vendor: CNCF
     createdAt: 2020-02-24T10:28:08Z
     support: https://slack.kubernetes.io/
 spec:
-  displayName: k8-pod-delete
+  displayName: k8-alb-ingress-controller
   categoryDescription: |
-    K8 Pod delete contains chaos to disrupt state of kubernetes resources. It uses chaostoolkit to inject random pod delete failures against specified applications
+    k8-alb-ingress-controller contains chaos to disrupt state of ingress controller. It uses chaostoolkit to inject random pod delete failures against ingress controller
   keywords:
     - Kubernetes
     - State
+    - Ingress
   platforms:
      - Minikube
   maturity: alpha
@@ -30,4 +31,4 @@ spec:
   icon:
     - url:
       mediatype: ""
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/k8-pod-delete/experiment.yaml
+  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/kube-components/k8-alb-ingress-controller/experiment.yaml
diff --git a/charts/generic/k8-alb-ingress-controller/rbac-admin.yaml b/charts/kube-components/k8-alb-ingress-controller/rbac-admin.yaml
similarity index 100%
rename from charts/generic/k8-alb-ingress-controller/rbac-admin.yaml
rename to charts/kube-components/k8-alb-ingress-controller/rbac-admin.yaml
diff --git a/charts/generic/k8-calico-node/Readme.md b/charts/kube-components/k8-calico-node/Readme.md
similarity index 100%
rename from charts/generic/k8-calico-node/Readme.md
rename to charts/kube-components/k8-calico-node/Readme.md
diff --git a/charts/generic/k8-calico-node/engine.yaml b/charts/kube-components/k8-calico-node/engine.yaml
similarity index 100%
rename from charts/generic/k8-calico-node/engine.yaml
rename to charts/kube-components/k8-calico-node/engine.yaml
diff --git a/charts/generic/k8-calico-node/experiment.yaml b/charts/kube-components/k8-calico-node/experiment.yaml
similarity index 100%
rename from charts/generic/k8-calico-node/experiment.yaml
rename to charts/kube-components/k8-calico-node/experiment.yaml
diff --git a/charts/generic/k8-calico-node/k8-calico-node.chartserviceversion.yaml b/charts/kube-components/k8-calico-node/k8-calico-node.chartserviceversion.yaml
similarity index 68%
rename from charts/generic/k8-calico-node/k8-calico-node.chartserviceversion.yaml
rename to charts/kube-components/k8-calico-node/k8-calico-node.chartserviceversion.yaml
index 8bbeb20..959f308 100644
--- a/charts/generic/k8-calico-node/k8-calico-node.chartserviceversion.yaml
+++ b/charts/kube-components/k8-calico-node/k8-calico-node.chartserviceversion.yaml
@@ -1,20 +1,21 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  name: k8-pod-delete
-  version: 0.0.4
+  name: k8-calico-node
+  version: 0.1.0
   annotations:
     categories: Kubernetes
     vendor: CNCF
     createdAt: 2020-02-24T10:28:08Z
     support: https://slack.kubernetes.io/
 spec:
-  displayName: k8-pod-delete
+  displayName: k8-calico-node
   categoryDescription: |
-    K8 Pod delete contains chaos to disrupt state of kubernetes resources. It uses chaostoolkit to inject random pod delete failures against specified applications
+    k8-calico-node contains chaos to disrupt state of calico pod. It uses chaostoolkit to inject random pod delete failures against calico node pod.
   keywords:
     - Kubernetes
     - State
+    - Calico
   platforms:
      - Minikube
   maturity: alpha
@@ -30,4 +31,4 @@ spec:
   icon:
     - url:
       mediatype: ""
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/k8-pod-delete/experiment.yaml
+  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/kube-components/k8-calico-node/experiment.yaml
diff --git a/charts/generic/k8-calico-node/rbac-admin.yaml b/charts/kube-components/k8-calico-node/rbac-admin.yaml
similarity index 100%
rename from charts/generic/k8-calico-node/rbac-admin.yaml
rename to charts/kube-components/k8-calico-node/rbac-admin.yaml
diff --git a/charts/generic/k8-kiam/Cluster/engine-kiam-count.yaml b/charts/kube-components/k8-kiam/Cluster/engine-kiam-count.yaml
similarity index 100%
rename from charts/generic/k8-kiam/Cluster/engine-kiam-count.yaml
rename to charts/kube-components/k8-kiam/Cluster/engine-kiam-count.yaml
diff --git a/charts/generic/k8-kiam/Cluster/engine-kiam-custom-count.yaml b/charts/kube-components/k8-kiam/Cluster/engine-kiam-custom-count.yaml
similarity index 100%
rename from charts/generic/k8-kiam/Cluster/engine-kiam-custom-count.yaml
rename to charts/kube-components/k8-kiam/Cluster/engine-kiam-custom-count.yaml
diff --git a/charts/generic/k8-kiam/Cluster/engine-kiam-custom-health.yaml b/charts/kube-components/k8-kiam/Cluster/engine-kiam-custom-health.yaml
similarity index 100%
rename from charts/generic/k8-kiam/Cluster/engine-kiam-custom-health.yaml
rename to charts/kube-components/k8-kiam/Cluster/engine-kiam-custom-health.yaml
diff --git a/charts/generic/k8-kiam/Cluster/engine-kiam-health.yaml b/charts/kube-components/k8-kiam/Cluster/engine-kiam-health.yaml
similarity index 100%
rename from charts/generic/k8-kiam/Cluster/engine-kiam-health.yaml
rename to charts/kube-components/k8-kiam/Cluster/engine-kiam-health.yaml
diff --git a/charts/generic/k8-kiam/Cluster/rbac-admin.yaml b/charts/kube-components/k8-kiam/Cluster/rbac-admin.yaml
similarity index 100%
rename from charts/generic/k8-kiam/Cluster/rbac-admin.yaml
rename to charts/kube-components/k8-kiam/Cluster/rbac-admin.yaml
diff --git a/charts/generic/k8-kiam/Readme.md b/charts/kube-components/k8-kiam/Readme.md
similarity index 100%
rename from charts/generic/k8-kiam/Readme.md
rename to charts/kube-components/k8-kiam/Readme.md
diff --git a/charts/generic/k8-kiam/engine.yaml b/charts/kube-components/k8-kiam/engine.yaml
similarity index 100%
rename from charts/generic/k8-kiam/engine.yaml
rename to charts/kube-components/k8-kiam/engine.yaml
diff --git a/charts/generic/k8-kiam/experiment.yaml b/charts/kube-components/k8-kiam/experiment.yaml
similarity index 100%
rename from charts/generic/k8-kiam/experiment.yaml
rename to charts/kube-components/k8-kiam/experiment.yaml
diff --git a/charts/generic/k8-kiam/k8-kiam.chartserviceversion.yaml b/charts/kube-components/k8-kiam/k8-kiam.chartserviceversion.yaml
similarity index 69%
rename from charts/generic/k8-kiam/k8-kiam.chartserviceversion.yaml
rename to charts/kube-components/k8-kiam/k8-kiam.chartserviceversion.yaml
index 8bbeb20..bf8b788 100644
--- a/charts/generic/k8-kiam/k8-kiam.chartserviceversion.yaml
+++ b/charts/kube-components/k8-kiam/k8-kiam.chartserviceversion.yaml
@@ -1,20 +1,21 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  name: k8-pod-delete
-  version: 0.0.4
+  name: k8-kiam
+  version: 0.1.0
   annotations:
     categories: Kubernetes
     vendor: CNCF
     createdAt: 2020-02-24T10:28:08Z
     support: https://slack.kubernetes.io/
 spec:
-  displayName: k8-pod-delete
+  displayName: k8-kiam
   categoryDescription: |
-    K8 Pod delete contains chaos to disrupt state of kubernetes resources. It uses chaostoolkit to inject random pod delete failures against specified applications
+    k8-kiam contains chaos to disrupt state of kiam. It uses chaostoolkit to inject random pod delete failures against kiam pod.
   keywords:
     - Kubernetes
     - State
+    - Kiam
   platforms:
      - Minikube
   maturity: alpha
@@ -30,4 +31,4 @@ spec:
   icon:
     - url:
       mediatype: ""
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/k8-pod-delete/experiment.yaml
+  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/kube-components/k8-kiam/experiment.yaml
diff --git a/charts/generic/k8-kiam/rbac-admin.yaml b/charts/kube-components/k8-kiam/rbac-admin.yaml
similarity index 100%
rename from charts/generic/k8-kiam/rbac-admin.yaml
rename to charts/kube-components/k8-kiam/rbac-admin.yaml
diff --git a/charts/generic/k8-kube-proxy/Readme.md b/charts/kube-components/k8-kube-proxy/Readme.md
similarity index 100%
rename from charts/generic/k8-kube-proxy/Readme.md
rename to charts/kube-components/k8-kube-proxy/Readme.md
diff --git a/charts/generic/k8-kube-proxy/engine.yaml b/charts/kube-components/k8-kube-proxy/engine.yaml
similarity index 100%
rename from charts/generic/k8-kube-proxy/engine.yaml
rename to charts/kube-components/k8-kube-proxy/engine.yaml
diff --git a/charts/generic/k8-kube-proxy/experiment.yaml b/charts/kube-components/k8-kube-proxy/experiment.yaml
similarity index 100%
rename from charts/generic/k8-kube-proxy/experiment.yaml
rename to charts/kube-components/k8-kube-proxy/experiment.yaml
diff --git a/charts/generic/k8-kube-proxy/k8-kube-proxy.chartserviceversion.yaml b/charts/kube-components/k8-kube-proxy/k8-kube-proxy.chartserviceversion.yaml
similarity index 68%
rename from charts/generic/k8-kube-proxy/k8-kube-proxy.chartserviceversion.yaml
rename to charts/kube-components/k8-kube-proxy/k8-kube-proxy.chartserviceversion.yaml
index 635546f..7423cac 100644
--- a/charts/generic/k8-kube-proxy/k8-kube-proxy.chartserviceversion.yaml
+++ b/charts/kube-components/k8-kube-proxy/k8-kube-proxy.chartserviceversion.yaml
@@ -1,20 +1,21 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  name: k8-pod-delete
-  version: 0.0.4
+  name: k8-kube-proxy
+  version: 0.1.0
   annotations:
     categories: Kubernetes
     vendor: CNCF
     createdAt: 2020-02-24T10:28:08Z
     support: https://slack.kubernetes.io/
 spec:
-  displayName: k8-pod-delete
+  displayName: k8-kube-proxy
   categoryDescription: |
-    K8 Pod delete contains chaos to disrupt state of kubernetes resources. It uses chaostoolkit to inject random pod delete failures against specified applications
+    k8-kube-proxy contains chaos to disrupt state of kube-proxy. It uses chaostoolkit to inject random pod delete failures against kube-proxy.
   keywords:
     - Kubernetes
     - State
+    - Kube-proxy
   platforms:
      - Minikube
   maturity: alpha
@@ -30,4 +31,4 @@ spec:
   icon:
     - url:
       mediatype: ""
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/k8-pod-delete/experiment.yaml
+  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/kube-components/k8-kube-proxy/experiment.yaml
diff --git a/charts/generic/k8-kube-proxy/rbac-admin.yaml b/charts/kube-components/k8-kube-proxy/rbac-admin.yaml
similarity index 100%
rename from charts/generic/k8-kube-proxy/rbac-admin.yaml
rename to charts/kube-components/k8-kube-proxy/rbac-admin.yaml
diff --git a/charts/generic/k8-prometheus-k8s-prometheus/Readme.md b/charts/kube-components/k8-prometheus-k8s-prometheus/Readme.md
similarity index 100%
rename from charts/generic/k8-prometheus-k8s-prometheus/Readme.md
rename to charts/kube-components/k8-prometheus-k8s-prometheus/Readme.md
diff --git a/charts/generic/k8-prometheus-k8s-prometheus/engine.yaml b/charts/kube-components/k8-prometheus-k8s-prometheus/engine.yaml
similarity index 100%
rename from charts/generic/k8-prometheus-k8s-prometheus/engine.yaml
rename to charts/kube-components/k8-prometheus-k8s-prometheus/engine.yaml
diff --git a/charts/generic/k8-prometheus-k8s-prometheus/experiment.yaml b/charts/kube-components/k8-prometheus-k8s-prometheus/experiment.yaml
similarity index 100%
rename from charts/generic/k8-prometheus-k8s-prometheus/experiment.yaml
rename to charts/kube-components/k8-prometheus-k8s-prometheus/experiment.yaml
diff --git a/charts/generic/k8-prometheus-k8s-prometheus/k8-prometheus-k8s-prometheus.chartserviceversion.yaml b/charts/kube-components/k8-prometheus-k8s-prometheus/k8-prometheus-k8s-prometheus.chartserviceversion.yaml
similarity index 64%
rename from charts/generic/k8-prometheus-k8s-prometheus/k8-prometheus-k8s-prometheus.chartserviceversion.yaml
rename to charts/kube-components/k8-prometheus-k8s-prometheus/k8-prometheus-k8s-prometheus.chartserviceversion.yaml
index 257fa30..7185aa4 100644
--- a/charts/generic/k8-prometheus-k8s-prometheus/k8-prometheus-k8s-prometheus.chartserviceversion.yaml
+++ b/charts/kube-components/k8-prometheus-k8s-prometheus/k8-prometheus-k8s-prometheus.chartserviceversion.yaml
@@ -1,20 +1,21 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  name: k8-pod-delete
-  version: 0.0.4
+  name: k8-prometheus-k8s-prometheus
+  version: 0.1.0
   annotations:
     categories: Kubernetes
     vendor: CNCF
     createdAt: 2020-02-24T10:28:08Z
     support: https://slack.kubernetes.io/
 spec:
-  displayName: k8-pod-delete
+  displayName: k8-prometheus-k8s-prometheus
   categoryDescription: |
-    K8 Pod delete contains chaos to disrupt state of kubernetes resources. It uses chaostoolkit to inject random pod delete failures against specified applications
+    k8-prometheus-k8s-prometheus contains chaos to disrupt state of prometheus. It uses chaostoolkit to inject random pod delete failures against prometheus application.
   keywords:
     - Kubernetes
     - State
+    - Prometheus
   platforms:
      - Minikube
   maturity: alpha
@@ -30,4 +31,4 @@ spec:
   icon:
     - url:
       mediatype: ""
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/k8-pod-delete/experiment.yaml
+  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/kube-components/k8-prometheus-k8s-prometheus/experiment.yaml
diff --git a/charts/generic/k8-prometheus-k8s-prometheus/rbac-admin.yaml b/charts/kube-components/k8-prometheus-k8s-prometheus/rbac-admin.yaml
similarity index 100%
rename from charts/generic/k8-prometheus-k8s-prometheus/rbac-admin.yaml
rename to charts/kube-components/k8-prometheus-k8s-prometheus/rbac-admin.yaml
diff --git a/charts/generic/k8-prometheus-operator/Readme.md b/charts/kube-components/k8-prometheus-operator/Readme.md
similarity index 100%
rename from charts/generic/k8-prometheus-operator/Readme.md
rename to charts/kube-components/k8-prometheus-operator/Readme.md
diff --git a/charts/generic/k8-prometheus-operator/engine.yaml b/charts/kube-components/k8-prometheus-operator/engine.yaml
similarity index 100%
rename from charts/generic/k8-prometheus-operator/engine.yaml
rename to charts/kube-components/k8-prometheus-operator/engine.yaml
diff --git a/charts/generic/k8-prometheus-operator/experiment.yaml b/charts/kube-components/k8-prometheus-operator/experiment.yaml
similarity index 100%
rename from charts/generic/k8-prometheus-operator/experiment.yaml
rename to charts/kube-components/k8-prometheus-operator/experiment.yaml
diff --git a/charts/generic/k8-prometheus-operator/k8-prometheus-operarator.chartserviceversion.yaml b/charts/kube-components/k8-prometheus-operator/k8-prometheus-operarator.chartserviceversion.yaml
similarity index 65%
rename from charts/generic/k8-prometheus-operator/k8-prometheus-operarator.chartserviceversion.yaml
rename to charts/kube-components/k8-prometheus-operator/k8-prometheus-operarator.chartserviceversion.yaml
index 257fa30..057b774 100644
--- a/charts/generic/k8-prometheus-operator/k8-prometheus-operarator.chartserviceversion.yaml
+++ b/charts/kube-components/k8-prometheus-operator/k8-prometheus-operarator.chartserviceversion.yaml
@@ -1,20 +1,21 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  name: k8-pod-delete
-  version: 0.0.4
+  name: k8-prometheus-operator
+  version: 0.1.0
   annotations:
     categories: Kubernetes
     vendor: CNCF
     createdAt: 2020-02-24T10:28:08Z
     support: https://slack.kubernetes.io/
 spec:
-  displayName: k8-pod-delete
+  displayName: k8-prometheus-operator
   categoryDescription: |
-    K8 Pod delete contains chaos to disrupt state of kubernetes resources. It uses chaostoolkit to inject random pod delete failures against specified applications
+    k8-prometheus-operator contains chaos to disrupt state of prometheus operator. It uses chaostoolkit to inject random pod delete failures against prometheus operator.
   keywords:
     - Kubernetes
     - State
+    - Prometheus
   platforms:
      - Minikube
   maturity: alpha
@@ -30,4 +31,4 @@ spec:
   icon:
     - url:
       mediatype: ""
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/k8-pod-delete/experiment.yaml
+  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/kube-components/k8-prometheus-operator/experiment.yaml
diff --git a/charts/generic/k8-prometheus-operator/rbac-admin.yaml b/charts/kube-components/k8-prometheus-operator/rbac-admin.yaml
similarity index 100%
rename from charts/generic/k8-prometheus-operator/rbac-admin.yaml
rename to charts/kube-components/k8-prometheus-operator/rbac-admin.yaml
diff --git a/charts/generic/k8-prometheus-pushgateway/Readme.md b/charts/kube-components/k8-prometheus-pushgateway/Readme.md
similarity index 100%
rename from charts/generic/k8-prometheus-pushgateway/Readme.md
rename to charts/kube-components/k8-prometheus-pushgateway/Readme.md
diff --git a/charts/generic/k8-prometheus-pushgateway/engine.yaml b/charts/kube-components/k8-prometheus-pushgateway/engine.yaml
similarity index 100%
rename from charts/generic/k8-prometheus-pushgateway/engine.yaml
rename to charts/kube-components/k8-prometheus-pushgateway/engine.yaml
diff --git a/charts/generic/k8-prometheus-pushgateway/experiment.yaml b/charts/kube-components/k8-prometheus-pushgateway/experiment.yaml
similarity index 100%
rename from charts/generic/k8-prometheus-pushgateway/experiment.yaml
rename to charts/kube-components/k8-prometheus-pushgateway/experiment.yaml
diff --git a/charts/generic/k8-prometheus-pushgateway/k8-prometheus-pushgateway.chartserviceversion.yaml b/charts/kube-components/k8-prometheus-pushgateway/k8-prometheus-pushgateway.chartserviceversion.yaml
similarity index 64%
rename from charts/generic/k8-prometheus-pushgateway/k8-prometheus-pushgateway.chartserviceversion.yaml
rename to charts/kube-components/k8-prometheus-pushgateway/k8-prometheus-pushgateway.chartserviceversion.yaml
index 257fa30..7b5b68f 100644
--- a/charts/generic/k8-prometheus-pushgateway/k8-prometheus-pushgateway.chartserviceversion.yaml
+++ b/charts/kube-components/k8-prometheus-pushgateway/k8-prometheus-pushgateway.chartserviceversion.yaml
@@ -1,20 +1,21 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  name: k8-pod-delete
-  version: 0.0.4
+  name: k8-prometheus-pushgateway
+  version: 0.1.0
   annotations:
     categories: Kubernetes
     vendor: CNCF
     createdAt: 2020-02-24T10:28:08Z
     support: https://slack.kubernetes.io/
 spec:
-  displayName: k8-pod-delete
+  displayName: k8-prometheus-pushgateway
   categoryDescription: |
-    K8 Pod delete contains chaos to disrupt state of kubernetes resources. It uses chaostoolkit to inject random pod delete failures against specified applications
+    k8-prometheus-pushgateway contains chaos to disrupt state of prometheus pushgateway. It uses chaostoolkit to inject random pod delete failures against prometheus pushgateway.
   keywords:
     - Kubernetes
     - State
+    - Prometheus
   platforms:
      - Minikube
   maturity: alpha
@@ -30,4 +31,4 @@ spec:
   icon:
     - url:
       mediatype: ""
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/k8-pod-delete/experiment.yaml
+  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/kube-components/k8-prometheus-pushgateway/experiment.yaml
diff --git a/charts/generic/k8-prometheus-pushgateway/rbac-admin.yaml b/charts/kube-components/k8-prometheus-pushgateway/rbac-admin.yaml
similarity index 100%
rename from charts/generic/k8-prometheus-pushgateway/rbac-admin.yaml
rename to charts/kube-components/k8-prometheus-pushgateway/rbac-admin.yaml
diff --git a/charts/generic/k8-wavefront-collector/Readme.md b/charts/kube-components/k8-wavefront-collector/Readme.md
similarity index 100%
rename from charts/generic/k8-wavefront-collector/Readme.md
rename to charts/kube-components/k8-wavefront-collector/Readme.md
diff --git a/charts/generic/k8-wavefront-collector/engine.yaml b/charts/kube-components/k8-wavefront-collector/engine.yaml
similarity index 100%
rename from charts/generic/k8-wavefront-collector/engine.yaml
rename to charts/kube-components/k8-wavefront-collector/engine.yaml
diff --git a/charts/generic/k8-wavefront-collector/experiment.yaml b/charts/kube-components/k8-wavefront-collector/experiment.yaml
similarity index 100%
rename from charts/generic/k8-wavefront-collector/experiment.yaml
rename to charts/kube-components/k8-wavefront-collector/experiment.yaml
diff --git a/charts/generic/k8-wavefront-collector/k8-wavefront-collector.chartserviceversion.yaml b/charts/kube-components/k8-wavefront-collector/k8-wavefront-collector.chartserviceversion.yaml
similarity index 65%
rename from charts/generic/k8-wavefront-collector/k8-wavefront-collector.chartserviceversion.yaml
rename to charts/kube-components/k8-wavefront-collector/k8-wavefront-collector.chartserviceversion.yaml
index 8bbeb20..41a065c 100644
--- a/charts/generic/k8-wavefront-collector/k8-wavefront-collector.chartserviceversion.yaml
+++ b/charts/kube-components/k8-wavefront-collector/k8-wavefront-collector.chartserviceversion.yaml
@@ -1,20 +1,21 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  name: k8-pod-delete
-  version: 0.0.4
+  name: k8-wavefront-collector
+  version: 0.1.0
   annotations:
     categories: Kubernetes
     vendor: CNCF
     createdAt: 2020-02-24T10:28:08Z
     support: https://slack.kubernetes.io/
 spec:
-  displayName: k8-pod-delete
+  displayName: k8-wavefront-collector
   categoryDescription: |
-    K8 Pod delete contains chaos to disrupt state of kubernetes resources. It uses chaostoolkit to inject random pod delete failures against specified applications
+    k8-wavefront-collector contains chaos to disrupt state of wavefront collector. It uses chaostoolkit to inject random pod delete failures against wavefront collector.
   keywords:
     - Kubernetes
     - State
+    - Wavefront
   platforms:
      - Minikube
   maturity: alpha
@@ -30,4 +31,4 @@ spec:
   icon:
     - url:
       mediatype: ""
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/k8-pod-delete/experiment.yaml
+  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/kube-components/k8-wavefront-collector/experiment.yaml
diff --git a/charts/generic/k8-wavefront-collector/rbac-admin.yaml b/charts/kube-components/k8-wavefront-collector/rbac-admin.yaml
similarity index 100%
rename from charts/generic/k8-wavefront-collector/rbac-admin.yaml
rename to charts/kube-components/k8-wavefront-collector/rbac-admin.yaml
diff --git a/charts/kube-components/kube-components.chartserviceversion.yaml b/charts/kube-components/kube-components.chartserviceversion.yaml
new file mode 100644
index 0000000..16063d1
--- /dev/null
+++ b/charts/kube-components/kube-components.chartserviceversion.yaml
@@ -0,0 +1,45 @@
+apiVersion: litmuchaos.io/v1alpha1
+kind: ChartServiceVersion
+metadata:
+  createdAt: 2020-11-9T10:28:08Z
+  name: kube-components
+  version: 0.1.0
+  annotations:
+    categories: kube-components
+    chartDescription: Injects chaos on kube components. It uses chaostoolkit.
+spec:
+  displayName: kube-components
+  categoryDescription: >
+    Kubernetes is an open-source system for automating deployment, scaling, and management of containerized applications. It groups containers that make up an application into logical units for easier management and discovery. It will install all the experiments which can be used to inject chaos into containerized applications.
+  experiments:
+    - k8-alb-ingress-controller
+    - k8-kiam
+    - k8-prometheus-operator
+    -  k8-kube-proxy
+    - k8-prometheus-pushgateway
+    - k8-calico-node
+    - k8-prometheus-k8s-prometheus
+    - k8-wavefront-collector 
+  keywords:
+    - Kubernetes
+    - Container
+    - Pod
+    - WaveFront
+    - Prometheus
+  maintainers:
+    - name: sumit
+      email: sumit_nagal@intuit.com
+  minKubeVersion: 1.12.0
+  provider:
+    name: Intuit
+  links:
+    - name: Kubernetes Website
+      url: https://kubernetes.io
+    - name: Source Code
+      url: https://github.com/kubernetes/kubernetes
+    - name: Kubernetes Slack
+      url: https://slack.kubernetes.io/ 
+  icon:
+    - url: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/kube-components/icons/kube-components.png
+      mediatype: image/png
+  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/kube-components/experiments.yaml
diff --git a/charts/kube-components/kube-components.package.yaml b/charts/kube-components/kube-components.package.yaml
new file mode 100644
index 0000000..89551a6
--- /dev/null
+++ b/charts/kube-components/kube-components.package.yaml
@@ -0,0 +1,26 @@
+packageName: kube-components
+experiments:
+  - name: k8-kiam
+    CSV: k8-kiam.chartserviceversion.yaml
+    desc: "k8-kiam"   
+  - name: k8-prometheus-operator
+    CSV: k8-prometheus-operator.chartserviceversion.yaml
+    desc: "k8-prometheus-operator"   
+  - name: k8-alb-ingress-controller
+    CSV: k8-alb-ingress-controller.chartserviceversion.yaml
+    desc: "k8-alb-ingress-controller"   
+  - name: k8-kube-proxy
+    CSV: k8-kube-proxy.chartserviceversion.yaml
+    desc: "k8-kube-proxy"   
+  - name: k8-prometheus-pushgateway
+    CSV: k8-prometheus-pushgateway.chartserviceversion.yaml
+    desc: "k8-prometheus-pushgateway"   
+  - name: k8-calico-node
+    CSV: k8-calico-node.chartserviceversion.yaml
+    desc: "k8-calico-node"   
+  - name: k8-prometheus-k8s-prometheus
+    CSV: k8-prometheus-k8s-prometheus.chartserviceversion.yaml
+    desc: "k8-prometheus-k8s-prometheus"   
+  - name: k8-wavefront-collector
+    CSV: k8-wavefront-collector.chartserviceversion.yaml
+    desc: "k8-wavefront-collector"