Topo-sort catseye.catalog a bit, introduce 3-level directories.