Moved helpers to their own directory (utils)