[UPDATED]: correct catalog structure