Some updates to catalog files; more repos, and reorganization.