Renamed files
Fix argument for maps of collector and marchand
Checking and resolved a lot of fails/bugs