Fixing errors due to change in xml path.
Merge remote-tracking branch 'origin/restructure' into restructure