Updated file structure and rivals Data