#141 Move helpers to the same package