Merge "sourcedr: Reorganize directory structure" am: cea43f29 am: 8ea4ad0d am: ad954d9a am: 7eacda88 am: 11764230 Change-Id: I9b68b68283ee8191f2249e13677931ddf53998a7