refactor table, catalog and courses