Reorganize and bring in sync with sony

Change-Id: Ic97f845acb18c33b6a73c7697705f2ff319a2362