Fix package folder flattening
Merge pull request #37 from ertrzyiks/master

Fix package folder flattening