Merge "sourcedr: Reorganize directory structure" am: cea43f29f2 am: 8ea4ad0db4
am: ad954d9a2d

Change-Id: I43373becc5604c320a986b19934220074efd3f5a