Modularization

Prajin Reddy Kanathalarequested to merge
modularization into test

Modularised code to make it reusable and easy to read.

Merge request reports