General Restructuring

Restructured SensorDevice and SensorArray.