Refactor activity packaging.