Refactor packaging to prepare for splitting into smaller jars