Start transitioning to 5.7 with organizations and catalogs