Restructure Catlog repo