TextController re-organization.