Revert "Revert "packaging - inital pull""

This reverts commit cb1bbdb1a058ccfdb4df65d194874bdca29404e1.