Renamed xml files and corrected references. Done for more clarity on the project layout structure
Merge remote-tracking branch 'origin/master'