restructure samples catalog