New cxxcam + modifications for spindle mode.
Reorganise