Big changes: creation of class Map and use of it everywhere + move all map + clean