Reorganise dirs.