diff --git a/charts/generic/container_kill/container_kill.chartserviceversion.yaml b/charts/generic/container-kill/container-kill.chartserviceversion.yaml
similarity index 93%
rename from charts/generic/container_kill/container_kill.chartserviceversion.yaml
rename to charts/generic/container-kill/container-kill.chartserviceversion.yaml
index b49f0c0..dd11962 100644
--- a/charts/generic/container_kill/container_kill.chartserviceversion.yaml
+++ b/charts/generic/container-kill/container-kill.chartserviceversion.yaml
@@ -30,4 +30,4 @@ spec:
   icon:
     - url: 
       mediatype: ""
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/container_kill/experiment.yaml
+  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/container-kill/experiment.yaml
diff --git a/charts/generic/container_kill/experiment.yaml b/charts/generic/container-kill/experiment.yaml
similarity index 100%
rename from charts/generic/container_kill/experiment.yaml
rename to charts/generic/container-kill/experiment.yaml
diff --git a/charts/generic/container_kill/container_kill.chartserviceversion.basetemplate.yaml b/charts/generic/container_kill/container_kill.chartserviceversion.basetemplate.yaml
deleted file mode 100644
index 76874c6..0000000
--- a/charts/generic/container_kill/container_kill.chartserviceversion.basetemplate.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-apiVersion: litmuchaos.io/v1alpha1
-kind: ChartServiceVersion
-metadata:
-  name: container-kill
-  version: {{ VERSION }}
-  annotations:
-    categories: "Kubernetes"
-    vendor: "CNCF"
-    repository: https://github.com/litmuschaos/chaos-charts
-    support: https://slack.openebs.io/
-spec:
-  displayName: container-kill
-  description: >
-   Container kill contains chaos to disrupt state of kubernetes resources. Experiments can inject random container delete failures against specified application. 
-  keywords:
-    - Kubernetes
-    - Container 
-  maturity: alpha
-  maintainers:
-    - name: ksatchit
-      email: karthik.s@mayadata.io
-  minKubeVersion: 1.12.0
-  provider:
-    name: Mayadata
-  links:
-    - name: Kubernetes Website
-      url: https://kubernetes.io
-    - name: Source Code
-      url: https://github.com/kubernetes/kubernetes
-  icon:
-    - url: 
-      mediatype: ""
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/container_kill/experiment.yaml
diff --git a/charts/generic/container_kill/experiment.basetemplate.yaml b/charts/generic/container_kill/experiment.basetemplate.yaml
deleted file mode 100644
index 0e46800..0000000
--- a/charts/generic/container_kill/experiment.basetemplate.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-apiVersion: litmuschaos.io/v1alpha1
-description:
-  message: "Kills a container belonging to an application pod \n"
-kind: ChaosExperiment
-metadata:
-  name: container-kill
-  version: {{ VERSION }}
-spec:
-  definition:
-    image: "litmuschaos/ansible-runner:ci"
-    args:
-    - -c
-    - ansible-playbook ./experiments/generic/container_kill/container_kill_ansible_logic.yml -i /etc/ansible/hosts -vv; exit 0
-    command:
-    - /bin/bash
-    env:
-    - name: ANSIBLE_STDOUT_CALLBACK
-      value: default
-    - name: TARGET_CONTAINER
-      value: ""
-    - name: KILL_MODE
-      value: ""
-    - name: LIB
-      value: ""
-    labels:
-      name: container-kill
\ No newline at end of file
diff --git a/charts/generic/generic.package.yaml b/charts/generic/generic.package.yaml
index d7f8813..4d47d53 100644
--- a/charts/generic/generic.package.yaml
+++ b/charts/generic/generic.package.yaml
@@ -1,11 +1,14 @@
 packageName: kubernetes 
 experiments:
   - name: pod-delete
-    CSV: pod_delete.chartserviceversion.yaml
+    CSV: pod-delete.chartserviceversion.yaml
     desc: "pod delete"
   - name: container-kill
-    CSV:  container_kill.chartserviceversion.yaml
+    CSV:  container-kill.chartserviceversion.yaml
     desc: "container kill"
-  - name: pod-network-delay
-    CSV: pod_network_delay.chartserviceversion.yaml
+  - name: pod-network-loss
+    CSV: pod-network-loss.chartserviceversion.yaml
+    desc: "Pod network delay"
+  - name: pod-network-latency
+    CSV: pod-network-latency.chartserviceversion.yaml
     desc: "Pod network delay"
diff --git a/charts/generic/pod_delete/experiment.yaml b/charts/generic/pod-delete/experiment.yaml
similarity index 100%
rename from charts/generic/pod_delete/experiment.yaml
rename to charts/generic/pod-delete/experiment.yaml
diff --git a/charts/generic/pod_delete/pod_delete.chartserviceversion.yaml b/charts/generic/pod-delete/pod-delete.chartserviceversion.yaml
similarity index 93%
rename from charts/generic/pod_delete/pod_delete.chartserviceversion.yaml
rename to charts/generic/pod-delete/pod-delete.chartserviceversion.yaml
index 1c353fe..e2021e6 100644
--- a/charts/generic/pod_delete/pod_delete.chartserviceversion.yaml
+++ b/charts/generic/pod-delete/pod-delete.chartserviceversion.yaml
@@ -31,4 +31,4 @@ spec:
   icon:
     - url: 
       mediatype: ""
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/pod_delete/experiment.yaml
+  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/pod-delete/experiment.yaml
diff --git a/charts/generic/pod_delete/experiment.basetemplate.yaml b/charts/generic/pod_delete/experiment.basetemplate.yaml
deleted file mode 100644
index 8420e9c..0000000
--- a/charts/generic/pod_delete/experiment.basetemplate.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-apiVersion: litmuschaos.io/v1alpha1
-description:
-  message: |
-    Deletes a pod belonging to a deployment/statefulset/daemonset
-kind: ChaosExperiment
-metadata:
-  name: pod-delete
-  version: {{ VERSION }}
-spec:
-  definition:
-    image: "litmuschaos/ansible-runner:ci"
-    args:
-    - -c
-    - ansible-playbook ./experiments/generic/pod_delete/pod_delete_ansible_logic.yml -i /etc/ansible/hosts -vv; exit 0
-    command:
-    - /bin/bash
-    env:
-    - name: ANSIBLE_STDOUT_CALLBACK
-      value: default
-    - name: TOTAL_CHAOS_DURATION
-      value: 15
-    - name: CHAOS_INTERVAL
-      value: 5
-    - name: LIB
-      value: ""
-    labels:
-      name: pod-delete
diff --git a/charts/generic/pod_delete/pod_delete.chartserviceversion.basetemplate.yaml b/charts/generic/pod_delete/pod_delete.chartserviceversion.basetemplate.yaml
deleted file mode 100644
index 4a11564..0000000
--- a/charts/generic/pod_delete/pod_delete.chartserviceversion.basetemplate.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-apiVersion: litmuchaos.io/v1alpha1
-kind: ChartServiceVersion
-metadata:
-  name: pod-delete
-  version: {{ VERSION }}
-  annotations:
-    categories: Kubernetes
-    vendor: CNCF
-    createdAt: 2019-08-12T10:28:08Z
-    repository: https://github.com/litmuschaos/chaos-charts
-    support: https://slack.kubernetes.io/
-spec:
-  displayName: pod-delete
-  description: >
-    Pod delete contains chaos to disrupt state of kubernetes resources. Experiments can inject random pod delete failures against specified application. 
-  keywords:
-    - Kubernetes
-    - State 
-  maturity: alpha
-  maintainers:
-    - name: ksatchit
-      email: karthik.s@mayadata.io
-  minKubeVersion: 1.12.0
-  provider:
-    name: Mayadata
-  links:
-    - name: Kubernetes Website
-      url: https://kubernetes.io
-    - name: Source Code
-      url: https://github.com/kubernetes/kubernetes
-  icon:
-    - url: 
-      mediatype: ""
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/pod_delete/experiment.yaml
diff --git a/charts/openebs/openebs-pool-failure/experiment.basetemplate.yaml b/charts/openebs/openebs-pool-failure/experiment.basetemplate.yaml
deleted file mode 100644
index a342836..0000000
--- a/charts/openebs/openebs-pool-failure/experiment.basetemplate.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-apiVersion: litmuschaos.io/v1alpha1
-description:
-  message: |
-    Kill the pool pod and check if gets scheduled again
-kind: ChaosExperiment
-metadata:
-  labels:
-    litmuschaos.io/name: openebs
-  name: openebs-pool-failure
-  version: {{ VERSION }}
-spec:
-  definition:
-    image: "openebs/ansible-runner:ci"
-    args:
-    - -c
-    - ansible-playbook ./experiments/chaos/openebs_pool_failure/test.yml -i /etc/ansible/hosts -vv; exit 0
-    command:
-    - /bin/bash
-    env:
-    - name: ANSIBLE_STDOUT_CALLBACK
-      value: default
-    - name: DATA_PERSISTENCE
-      value: ""
-    - name: CHAOS_TYPE
-      value: "pool-kill"
-    - name: CHAOS_ITERATIONS
-      value: "2"
-    labels:
-      name: openebs-pool-failure
-    configmaps:
-    - name: pool-failure
-      data:
-        parameters.yml: |
\ No newline at end of file
diff --git a/charts/openebs/openebs-pool-failure/openebs_pool_failure.chartserviceversion.basetemplate.yaml b/charts/openebs/openebs-pool-failure/openebs_pool_failure.chartserviceversion.basetemplate.yaml
deleted file mode 100644
index 42567fd..0000000
--- a/charts/openebs/openebs-pool-failure/openebs_pool_failure.chartserviceversion.basetemplate.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-apiVersion: litmuchaos.io/v1alpha1
-kind: ChartServiceVersion
-metadata:
-  name: openebs-pool-failure
-  version: {{ VERSION }}
-  annotations:
-    categories: OpenEBS
-    vendor: CNCF
-    repository: https://github.com/litmuschaos/chaos-charts
-    support: https://slack.openebs.io/
-spec:
-  displayName: openebs-pool-failure 
-  description: >
-     Kill the pool pod and check if gets scheduled again. 
-  keywords:
-    - Kubernetes
-    - Storage Pool
-    - OpenEBS
-  maturity: alpha
-  maintainers:
-    - name: shubham chaudhary
-      email: shubham.chaudhary@mayadata.io
-  minKubeVersion: 1.12.0
-  provider:
-    name: Mayadata
-  readme: "https://github.com/mayadata-io/litmus/blob/master/experiments/chaos/openebs_pool_failure/README.md"
-  links:
-    - name: OpenEBS Website
-      url: https://openebs.io
-    - name: Source Code
-      url: https://github.com/openebs/openebs
-  icon:
-    - url: ""
-      mediatype: ""
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/openebs/openebs-pool-failure/experiment.yaml
diff --git a/charts/openebs/openebs-target-failure/experiment.basetemplate.yaml b/charts/openebs/openebs-target-failure/experiment.basetemplate.yaml
deleted file mode 100644
index 6b6514d..0000000
--- a/charts/openebs/openebs-target-failure/experiment.basetemplate.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-apiVersion: litmuschaos.io/v1alpha1
-description:
-  message: |
-    Kill the cstor target/Jiva controller container and check if gets created again
-kind: ChaosExperiment
-metadata:
-  labels:
-    litmuschaos.io/name: openebs
-  name: openebs-target-failure
-  version: {{ VERSION }}
-spec:
-  definition:
-    image: "openebs/ansible-runner:ci"
-    args:
-    - -c
-    - ansible-playbook ./experiments/chaos/openebs_target_failure/test.yml -i /etc/ansible/hosts -vv; exit 0
-    command:
-    - /bin/bash
-    env:
-    - name: ANSIBLE_STDOUT_CALLBACK
-      value: default
-    - name: TARGET_NAMESPACE
-      value: "openebs"
-    - name: DATA_PERSISTENCE
-      value: ""
-    - name: CHAOS_TYPE
-      value: "target-zrepl-kill"
-    - name: TARGET_CONTAINER
-      value: "cstor-volume-mgmt"
-    - name: DEPLOY_TYPE
-      value: "deployment"
-    labels:
-      name: openebs-target-failure
-    configmaps:
-    - name: target-failure
-      data:
-        parameters.yml: |
\ No newline at end of file
diff --git a/charts/openebs/openebs-target-failure/openebs_target_failure.chartserviceversion.basetemplate.yaml b/charts/openebs/openebs-target-failure/openebs_target_failure.chartserviceversion.basetemplate.yaml
deleted file mode 100644
index c48f252..0000000
--- a/charts/openebs/openebs-target-failure/openebs_target_failure.chartserviceversion.basetemplate.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-apiVersion: litmuchaos.io/v1alpha1
-kind: ChartServiceVersion
-metadata:
-  name: openebs-target-failure
-  version: {{ VERSION }}
-  annotations:
-    categories: OpenEBS
-    vendor: CNCF
-    repository: https://github.com/litmuschaos/chaos-charts
-    support: https://slack.openebs.io/
-spec:
-  displayName: openebs-target-failure 
-  description: >
-     Kill the cstor target/Jiva controller container and check if gets created again
-  keywords:
-    - Kubernetes
-    - Storage Controller
-    - OpenEBS
-  maturity: alpha
-  maintainers:
-    - name: shubham chaudhary
-      email: shubham.chaudhary@mayadata.io
-  minKubeVersion: 1.12.0
-  provider:
-    name: Mayadata
-  readme: "https://github.com/mayadata-io/litmus/blob/master/experiments/chaos/openebs_target_failure/README.md"
-  links:
-    - name: OpenEBS Website
-      url: https://openebs.io
-    - name: Source Code
-      url: https://github.com/openebs/openebs
-  icon:
-    - url: ""
-      mediatype: ""
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/openebs/openebs-target-failure/experiment.yaml
diff --git a/charts/openebs/openebs-target-network-delay/experiment.basetemplate.yaml b/charts/openebs/openebs-target-network-delay/experiment.basetemplate.yaml
deleted file mode 100644
index 1f3a28b..0000000
--- a/charts/openebs/openebs-target-network-delay/experiment.basetemplate.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-apiVersion: litmuschaos.io/v1alpha1
-description:
-  message: |
-    Network delay to target pod belonging to a deployment/statefulset/daemonset
-kind: ChaosExperiment
-metadata:
-  labels:
-    litmuschaos.io/name: openebs
-  name: openebs-target-network-delay
-  version: {{ VERSION }}
-spec:
-  definition:
-    image: "openebs/ansible-runner:ci"
-    args:
-    - -c
-    - ansible-playbook ./experiments/chaos/experiments/chaos/openebs_target_network_delay/test.yml -i /etc/ansible/hosts -vv; exit 0
-    command:
-    - /bin/bash
-    env:
-    - name: ANSIBLE_STDOUT_CALLBACK
-      value: "default"
-    - name: OPERATOR_NAMESPACE
-      value: "openebs"
-    - name: NETWORK_DELAY
-      value: "60" # in milliseconds (Mandatory)
-    - name: CHAOS_DURATION
-      value: "60" # in milliseconds (Mandatory)
-    - name: DATA_PERSISTENCY
-      value: ""
-    labels:
-      name: openebs-target-network-delay
\ No newline at end of file
diff --git a/charts/openebs/openebs-target-network-delay/openebs_target_network_delay.chartserviceversion.basetemplate.yaml b/charts/openebs/openebs-target-network-delay/openebs_target_network_delay.chartserviceversion.basetemplate.yaml
deleted file mode 100644
index 5934463..0000000
--- a/charts/openebs/openebs-target-network-delay/openebs_target_network_delay.chartserviceversion.basetemplate.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-apiVersion: litmuchaos.io/v1alpha1
-kind: ChartServiceVersion
-metadata:
-  name: openebs-target-network-delay
-  version: {{ VERSION }}
-  annotations:
-    categories: Kubernetes
-    vendor: CNCF
-    repository: https://github.com/litmuschaos/community-charts
-    support: https://slack.kubernetes.io/
-spec:
-  displayName: openebs_target_network_delay
-  description: >
-    Network delay to Pod belonging to a OpenEBS PVC
-  keywords:
-    - OpenEBS
-    - Kubernetes
-    - Network Delay 
-  maturity: alpha
-  maintainers:
-    - name: giri
-      email: giridhara.prasad@mayadata.io
-  minKubeVersion: 1.12.0
-  provider:
-    name: Mayadata
-  links:
-    - name: OpenEBS Website
-      url: https://openebs.io
-    - name: Source Code
-      url: https://github.com/openebs/openebs
-  icon:
-    - url: 
-      mediatype: ""
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/openebs/openebs-target-network-delay/experiment.yaml
diff --git a/charts/openebs/openebs-target-network-loss/experiment.basetemplate.yaml b/charts/openebs/openebs-target-network-loss/experiment.basetemplate.yaml
deleted file mode 100644
index 59b5db0..0000000
--- a/charts/openebs/openebs-target-network-loss/experiment.basetemplate.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-apiVersion: litmuschaos.io/v1alpha1
-description:
-  message: |
-    Network loss to target pod belonging to a OpenEBS PVC
-kind: ChaosExperiment
-metadata:
-  labels:
-    litmuschaos.io/name: openebs
-  name: openebs-target-network-loss
-  version: {{ VERSION }}
-spec:
-  definition:
-    image: "openebs/ansible-runner:ci"
-    args:
-    - -c
-    - ansible-playbook ./experiments/chaos/experiments/chaos/openebs_target_network_loss/test.yml -i /etc/ansible/hosts -vv; exit 0
-    command:
-    - /bin/bash
-    env:
-    - name: ANSIBLE_STDOUT_CALLBACK
-      value: "default"
-    - name: OPERATOR_NAMESPACE
-      value: "openebs"
-    - name: NETWORK_DELAY
-      value: "60" # in milliseconds (Mandatory)
-    - name: CHAOS_DURATION
-      value: "60" # in milliseconds (Mandatory)
-    - name: DATA_PERSISTENCY
-      value: ""
-    labels:
-      name: openebs-target-network-loss
\ No newline at end of file
diff --git a/charts/openebs/openebs-target-network-loss/openebs_target_network_loss.chartserviceversion.basetemplate.yaml b/charts/openebs/openebs-target-network-loss/openebs_target_network_loss.chartserviceversion.basetemplate.yaml
deleted file mode 100644
index 6e292cb..0000000
--- a/charts/openebs/openebs-target-network-loss/openebs_target_network_loss.chartserviceversion.basetemplate.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-apiVersion: litmuchaos.io/v1alpha1
-kind: ChartServiceVersion
-metadata:
-  name: openebs-target-network-loss
-  version: {{ VERSION }}
-  annotations:
-    categories: Kubernetes
-    vendor: CNCF
-    repository: https://github.com/litmuschaos/chaos-charts
-    support: https://slack.kubernetes.io/
-spec:
-  displayName: openebs-target-network-loss
-  description: >
-    Network loss to the target pod belonging to an OpenEBS PVC
-  keywords:
-    - Kubernetes
-    - OpenEBS 
-    - Network Loss
-  maturity: alpha
-  maintainers:
-    - name: giri
-      email: giridhara.prasad@mayadata.io
-  minKubeVersion: 1.12.0
-  provider:
-    name: Mayadata
-  links:
-    - name: Kubernetes Website
-      url: https://openebs.io
-    - name: Source Code
-      url: https://github.com/openebes/openebs
-  icon:
-    - url: ""
-      mediatype: ""
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/openebs/openebs-target-network-loss/experiment.yaml
diff --git a/charts/openebs/pod_delete/experiment.yaml b/charts/openebs/pod_delete/experiment.yaml
deleted file mode 100644
index d07e2d2..0000000
--- a/charts/openebs/pod_delete/experiment.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-apiVersion: litmuschaos.io/v1alpha1
-description:
-  message: |
-    Deletes a pod belonging to a deployment/statefulset/daemonset
-kind: ChaosExperiment
-metadata:
-  name: kubernetes-state-pod-delete-0.1.1
-  version: 0.1.1
-spec:
-  definition:
-    args:
-    - -c
-    - ansible-playbook ./experiments/chaos/kubernetes/pod_delete/test.yml -i /etc/ansible/hosts
-      -vv; exit 0
-    command:
-    - /bin/bash
-    env:
-    - name: ANSIBLE_STDOUT_CALLBACK
-      value: default
-    - name: TOTAL_CHAOS_DURATION
-      value: 15
-    - name: CHAOS_INTERVAL
-      value: 5
-    - name: LIB
-      value: ""
-    image: ""
-    labels:
-      name: pod-delete
-    litmusbook: /experiments/chaos/kubernetes/pod_delete/run_litmus_test.yml
----