Code restructuring

Hi Keith,

In this commit, I have restructure the code as per the project standards. 

Thanks
Nayan Ambali