Move to DataFormat/Math ?