Reorganise for Robot Framework integration