Add forms scaffold. Modified fields to belong to forms.