Update paths
Use catalog.py -t
Original merge-cbfs.py