Revert "Soham | BSHR-274 | Refactoring."

This reverts commit f976fae8c360dad94f81477f2ba8162986038735.