--HR-250 Renamed and moved files.
Merge pull request #344 from PoonamNalawade/HR-250-Renamefiles

--HR-250 Renamed and moved files.