refactor the sensors to be self contained - issue #8