moved data types to library