Refactoring of position of fields.