Moved catalog classes to dedicated repository