Renames and reorganise