Rearrange some more fuctions into topical areas.