Small refactoring.
SPlit adapters over several modules.