move catalog to includes