Changing the list of heroes

Changing the local collection of heroes
Also additional changes around some files