Refactor CARS geoserver layer creation