Code Refactoring

Further made some changes in the refactoring of the code. The
refactoring of main class i.e. RandomTestGenerator is still to
be done.

Signed-off-by: Siddharth Goel <siddharth98391@gmail.com>