reorganize, bates master