Massive refactoring for a better decoupled API