make packaging more granular