Refactor fields to have the including class context so we can build HTML in each class.