Organize types