renamed mapstorage.go to map-storage.go