Move helpers to helpers directory