Refactor design #79

Closed bastien-riado closed 4 months ago