Merge "Adapt to restructuring of code in repo"