Infra

We can agree decoupling is a good practice that simplifies the code and the maintainability of the …