Refactoring package creation for mac os x
Merging with zelgerjs changes