Refactored fields into a separate package.