Reorganise the view controllers