Restructure and reformat code
Merge pull request #6 from emaadmanzoor/restructure

Restructure and reformat code