Form folder hierarchy
Merge pull request #2 from sugandha7/new-python

Fixups