Merge "Move HTMLFormField subclasses to a separate directory"