Move types into types.go