Changes on file names + bug on map fixed