New: Moved helpers to their own folder