Extract classes

Hopefully fixing SonicSensorMotor slightly better