HOPKINS: Start refactoring PARCOURS2