worked on standardizing upgrade function according to CiviHR version

worked on standardizing upgrade function according to CiviHR version 1.1
moved around xmls to follow convention