Code cleanup and refactoring
More output files added

Change-Id: I2c834c88059e20cda8f716cca8cd03edb406d7ef
Signed-off-by: NiharKhetan <nihar.khetan@gmail.com>