Move helpers to the new location