Merge "sourcedr: Reorganize directory structure"