Moved types to files