Reorganise Variables