No, Keep it like it is (Swimming, running, cycling subforums)
Yes, change it (One general forum, with subforums for Ironman, Sprint & Olympic and beginners