reorganize strings

Change-Id: I7d185b61ec7fca663e5efde5fd4f9336b9d7d272
Signed-off-by: Willi Ye <williye97@gmail.com>