re-org, and text src