Merge pull request #1 from andrerod/dev

Implementing package structure / store
Apply code review comments
Merge pull request #2 from andrerod/dev

Apply code review comments
merge
merge