Rearranged the datatype definitions.