Desired Html structure for a form, excluding the fieldset stuff. Label only has the required class & matching span if required.

form.html

<ul>
  <li>
    <div class="editor-label required">
      <label>Text Field: </label><span>*</span>
    </div>    
    <div class="editor-field">
      <input type="text" value="Default" id="CompanyName">
      <span class="field-validation-error">The CompanyName field is required.</span>
    </div>
  </li>
  <li>
     .... And so on ....
  </li>
</ul>