Fixed missing comments in XML + renameing of files