Structural Changes
Merge pull request #36 from sushant94/finish

Major Structural Changes