Moved some files to 'helpers'