Move lat/lon and cam/stream into contact/sensor groups

Adds cam and stream as new sensor types, while also moving lat and lon into the contact group.