Extracting types to separate files