Re-structure leaflet library because of leaflet module update