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

Change-Id: I9d580780332158820336552de0506b5a6043daff