Separate types into separate files