Split xblock.core into smaller files, and rename ModelType to Field