Moving individual types to seperate files