Moved DataType and DataItem classes into their own files