Moved types to matching files