Add a contentDescription for the Helpers (1/2)

And some organization

Change-Id: Iae018f7d31036398d8768165ff48aeca1e281e74