Renamed package-map.jinja to map.jinja; is used for more than package names
Added EOF newline