Fix client-side sensor code separation.