Separate files by owner

Change-Id: I0f9a279fe1d99978652c3a07de1f28e65caefcdd
40 files changed