Revert "Restructuring logic and removing duplicated code"
Merge pull request #11 from nmadhok/revert-10-restructure-logic

Revert "Restructuring logic and removing duplicated code"