Move helpers from server to pack, closes #1016