diff --git a/ADOPTERS.md b/ADOPTERS.md
index be687d70c..87c70429d 100644
--- a/ADOPTERS.md
+++ b/ADOPTERS.md
@@ -1,21 +1,21 @@
 This is the list of organizations and users that publicly shared details of how they are using LitmusChaos for running chaos experiments. 
 Please send PRs to add or remove organizations/users.
 
-| Organization | Applications/Workloads | Success Story |
-| :---         | :---               | :---|
-|[Zebrium](https://www.zebrium.com?utm_source=github&utm_campaign=litmuschaos_repo)|[Zebrium K8s Demo](https://github.com/zebrium/zebrium-kubernetes-demo)|[our story](https://github.com/litmuschaos/litmus/blob/master/adopters/zebrium.md)|
-|[MayaData](https://mayadata.io)|[Director Online](https://director.mayadata.io/)|[our story](https://github.com/litmuschaos/litmus/tree/master/adopters/MayaData_DirectorOnline.md)|
-|[OpenEBS](https://openebs.io/)|[openebs-ci](https://openebs.ci/)|[our story](https://github.com/litmuschaos/litmus/tree/master/adopters/openebs.md)|
-|[Wipro](https://www.wipro.com/en-IN/infrastructure/wipros-appanywhere/?utm_source=github&utm_campaign=litmuschaos_repo)|[Wipro AppAnywhere](https://www.wipro.com/en-IN/infrastructure/wipros-appanywhere/?utm_source=github&utm_campaign=litmuschaos_repo)|[our story](https://github.com/litmuschaos/litmus/tree/master/adopters/AppAnywhere.md)|
-|[Intuit](https://www.intuit.com?utm_source=github&utm_campaign=litmuschaos_repo)|[Argo-Litmus Demo](https://youtu.be/Uwqop-s99LA?t=720)|[our story](https://github.com/litmuschaos/litmus/tree/master/adopters/intuit.md)|
-|[Okteto](https://okteto.com)|[Okteto-Litmus Demo](https://okteto.com/blog/chaos-engineering-with-litmus/)| [our story](adopters/okteto.md)|
-|[WeScale](https://www.wescale.fr)|[Chaos Engineering](https://blog.wescale.fr/2020/03/19/le-guide-de-chaos-engineering-partie-2/)|[our story](https://github.com/litmuschaos/litmus/blob/master/adopters/wescale.md)|
-|[NetApp](https://www.netapp.com)|[Chaos Engineering](https://www.netapp.com/us/index.aspx)|[our story](https://github.com/litmuschaos/litmus/blob/master/adopters/netapp.md)|
+| Organization | Usecase | Details |
+| :---         | :---    | :---    |
+|[Zebrium](https://www.zebrium.com?utm_source=github&utm_campaign=litmuschaos_repo)|[Zebrium K8s Chaos Project](https://github.com/zebrium/zebrium-kubernetes-demo)|[Our Story](adopters/organizations/zebrium.md)|
+|[MayaData](https://mayadata.io)|[Director Online](https://director.mayadata.io/)|[Our Story](adopters/organizations/mayadata.md)|
+|[OpenEBS](https://openebs.io/)|[Openebs-CI](https://openebs.ci/)|[Our Story](adopters/organizations/openebs.md)|
+|[Wipro](https://www.wipro.com/en-IN/infrastructure/wipros-appanywhere/?utm_source=github&utm_campaign=litmuschaos_repo)|[Wipro AppAnywhere](https://www.wipro.com/en-IN/infrastructure/wipros-appanywhere/?utm_source=github&utm_campaign=litmuschaos_repo)|[Our Story](adopters/organizations/wipro.md)|
+|[Intuit](https://www.intuit.com?utm_source=github&utm_campaign=litmuschaos_repo)|[Argo Based Chaos Workflows](https://youtu.be/Uwqop-s99LA?t=720)|[Our Story](adopters/organizations/intuit.md)|
+|[Okteto](https://okteto.com)|[Okteto-Litmus Integration](https://okteto.com/blog/chaos-engineering-with-litmus/)| [Our Story](adopters/organizations/okteto.md)|
+|[WeScale](https://www.wescale.fr)|[Chaos Engineering](https://blog.wescale.fr/2020/03/19/le-guide-de-chaos-engineering-partie-2/)|[Our Story](adopters/organizations/wescale.md)|
+|[NetApp](https://www.netapp.com)|[Chaos Engineering](https://www.netapp.com/us/index.aspx)|[Our Story](adopters/organizations/netapp.md)|
 
-| User | Applications/Workloads | Success Story |
-| :--- | :--- | :--- |
-| [Laura Henning](https://github.com/LaumiH) | reasearch on how to do chaos engineering in minikube demo clusters like [these](https://github.com/LaumiH/k8sstuff) | [my story](https://github.com/litmuschaos/litmus/tree/master/adopters/Laura_Henning_Research_Project.md) |
-| [Johnny Jacob](https://github.com/johnnyjacob) | Testing deployment designs for resiliency | Coming Soon! |
-| [Jayesh Kumar Tank](https://github.com/k8s-dev) | Create Cloud Native Validation Suite on [Demo Application](https://github.com/k8s-dev/microservices-demo)| [my story](https://github.com/litmuschaos/litmus/tree/master/adopters/Jayesh_Kumar_CloudNative_Validation.md)|
-| [Bhaumik Shah](https://github.com/Bhaumik1802) | Use LitmusChaos for Kafka Resiliency on Dev/Staging| [my story](https://github.com/litmuschaos/litmus/tree/master/adopters/Bhaumik_Shah_Kafka_Chaos.md)|
-| [Jayadeep KM](https://github.com/kmjayadeep) | Ensure reliability of microservices| [my story](https://github.com/litmuschaos/litmus/tree/master/adopters/jayadeep_microservices.md)|
+| User | Usecase | Details |
+| :--- | :---    | :---    |
+| [Laura Henning](https://github.com/LaumiH)|Reasearch on how to do chaos engineering in minikube clusters like [these](https://github.com/LaumiH/k8sstuff)|[My Story](adopters/users/Laura_Henning.md) 
+| [Johnny Jacob](https://github.com/johnnyjacob)|Testing deployment designs for resiliency|Coming Soon!|
+| [Jayesh Kumar Tank](https://github.com/k8s-dev)|Create Cloud Native Validation Suite on [Microservices Application](https://github.com/k8s-dev/microservices-demo)|[My Story](adopters/users/Jayesh_Kumar_Tank.md)|
+| [Bhaumik Shah](https://github.com/Bhaumik1802)|Use LitmusChaos for Kafka Resiliency on Dev/Staging|[My Story](adopters/users/Bhaumik_Shah.md)|
+| [Jayadeep KM](https://github.com/kmjayadeep)|Ensure reliability of microservices|[My Story](adopters/users/Jayadeep_KM.md)|
diff --git a/adopters/intuit.md b/adopters/organizations/intuit.md
similarity index 100%
rename from adopters/intuit.md
rename to adopters/organizations/intuit.md
diff --git a/adopters/MayaData_DirectorOnline.md b/adopters/organizations/mayadata.md
similarity index 100%
rename from adopters/MayaData_DirectorOnline.md
rename to adopters/organizations/mayadata.md
diff --git a/adopters/netapp.md b/adopters/organizations/netapp.md
similarity index 100%
rename from adopters/netapp.md
rename to adopters/organizations/netapp.md
diff --git a/adopters/okteto.md b/adopters/organizations/okteto.md
similarity index 100%
rename from adopters/okteto.md
rename to adopters/organizations/okteto.md
diff --git a/adopters/openebs.md b/adopters/organizations/openebs.md
similarity index 100%
rename from adopters/openebs.md
rename to adopters/organizations/openebs.md
diff --git a/adopters/wescale.md b/adopters/organizations/wescale.md
similarity index 100%
rename from adopters/wescale.md
rename to adopters/organizations/wescale.md
diff --git a/adopters/AppAnywhere.md b/adopters/organizations/wipro.md
similarity index 100%
rename from adopters/AppAnywhere.md
rename to adopters/organizations/wipro.md
diff --git a/adopters/zebrium.md b/adopters/organizations/zebrium.md
similarity index 100%
rename from adopters/zebrium.md
rename to adopters/organizations/zebrium.md
diff --git a/adopters/Bhaumik_Shah_Kafka_Chaos.md b/adopters/users/Bhaumik_Shah.md
similarity index 100%
rename from adopters/Bhaumik_Shah_Kafka_Chaos.md
rename to adopters/users/Bhaumik_Shah.md
diff --git a/adopters/jayadeep_microservices.md b/adopters/users/Jayadeep_KM.md
similarity index 100%
rename from adopters/jayadeep_microservices.md
rename to adopters/users/Jayadeep_KM.md
diff --git a/adopters/Jayesh_Kumar_CloudNative_Validation.md b/adopters/users/Jayesh_Kumar_Tank.md
similarity index 100%
rename from adopters/Jayesh_Kumar_CloudNative_Validation.md
rename to adopters/users/Jayesh_Kumar_Tank.md
diff --git a/adopters/Laura_Henning_Research_Project.md b/adopters/users/Laura_Henning.md
similarity index 100%
rename from adopters/Laura_Henning_Research_Project.md
rename to adopters/users/Laura_Henning.md