refacto code into distinct managers
Merge branch 'feature/refacto' into develop

* feature/refacto:
  refacto code into distinct managers