Major Rework . 

1. Added Super Class for all Test case groups
2. Moved common part to super class
3. Separated each test case to separate files
4. Added Ordering in Suite files 

Drawback : Have to added test cases one by one to suite files