restructure the Sensor for better composition