Moved all from helpers to scripts