Restructured
Merge pull request #18 from saru95/master

Restructured