Putting catalogs in the right places

And adding a single master catalog to point to the rest