Move Convert component in a separate repository alongside, capturing and surrender components.