Fix for package structure
Merge pull request #25 from shantanud/2.1

Fix for package structure