renamed files and changed xml mappings