Reorganization of calibration

Trying to make the flow of the calibration process easier to follow.
Not done yet...
Further calibration reorganization

Untested (Nicke is hogging the Kinect) :)
Nothing

Grrr, git is misbehaving!