Moved the xml file to the right place and made more changes