[3.0] TextController re-organization.