Rework package and file structure
Merge pull request #48 from kavu/rework

Rework package file structure