New classification for the composite genus Aedes (Diptera: Culicidae: Aedini), elevation of subgenus Ochlerotatus to generic rank, reclassification of the other subgenera, and notes on certain subgenera and species.