Move helpers to a new package