renamed map-storage.go to map_storage.go