Revert "Refactoring"

This reverts commit a933a11abeec1aabb7a04fb21c1e8267ecd38c7c.
ading
New code Master
Merge branch 'master' of https://github.com/pranitp/pre-tested