(#393) - Refactor to get closer to decoupled modules