Code cleanup and directory structuring
Merge pull request #1 from ishouvik/master

Code cleanup and directory structuring