Begins to reorganize JS form helpers