Move images into subfolders in anticipation of icon buttons

Change-Id: I702c988ef3a73af0428b293ac7c48c9f11af478b
Merge "Move images into subfolders in anticipation of icon buttons"