Separate types into separate source files