move field and class methods into separate files