Move most helper functions from utils to helpers
Merge branch '570-helpers-refactor-continued' into development