reorganize fields