Merge "Add src/xConnect directory"