re arange arrays and strings

Change-Id: I9497a5ca7924693a51d8b94b4285b7f16b331b98