Migrate resources to new assets catalog. Cosmetic changes