Rearrange catalog structure

Catalog structure given to the original