Merge "sourcedr: Reorganize directory structure"
am: cea43f29f2

Change-Id: I639c8b43541636b2f3ccb3d823818922d3b571a2