Merge "sourcedr: Add new features and reorganize code"