gbs packaging
Packaging cleanup