Move the xctool wrapping code to a gem
Reorganise