Rearranging deck chairs

Change-Id: I14b4690bada99cfec2942a324178bc563fc994de