Merge pull request #395 from gloryming/master

updated catalog structure