Initial refactor of formfields.

Change-Id: I98ad1f90dc295cfc0d895a6887e3dfb335dd3cdd