Reorganise repo