Refactoring into modules, dedicated DO client and more!!