Refactored package and added binary