Leaner package distribution
Merge pull request #543 from eordano/style/package

Leaner package distribution