m2: clean up and organize sensors

Change-Id: I4eb705af26752215b5f98c72b1d4ad7503e05718