Refactor block/sensor/...