Removed garbage files and replaced structure.xml with the correct one