Finally reorganizing to make sense... Comm/Sensor.* -> Sensor/Sensor.*